diff --git a/HISTORY b/HISTORY index 4bea70296493c178aaa90646062393961918e417..608b33f8fcf471dd94bfe15c749c7548b96d5407 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,5 @@ -Version 1.06 2014-06-17 +Version 1.06 2014-06-18 * update source code from FastDFS V5.02 * add function short2buff and buff2short * add object memory pool (fast_mblock.h and fast_mblock.c) @@ -10,6 +10,7 @@ Version 1.06 2014-06-17 * logger can set rotate time format * add connection pool * logger can log header line + * #include to use C99 bool Version 1.05 2012-07-08 * update source code from FastDFS V3.09 diff --git a/src/common_define.h b/src/common_define.h index 5cb8128e4850a6018f54207e3cc1c0b8373df581..3a4bd2b6f9e7729a652816f4cb5ccbdb6e817d85 100644 --- a/src/common_define.h +++ b/src/common_define.h @@ -27,6 +27,7 @@ typedef DWORD (WINAPI *ThreadEntranceFunc)(LPVOID lpThreadParameter); #include #include +#include #include #include #include @@ -89,14 +90,6 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind); #define IP_ADDRESS_SIZE 16 #define INFINITE_FILE_SIZE (256 * 1024LL * 1024 * 1024 * 1024 * 1024LL) -#ifndef __cplusplus -#ifndef true -typedef char bool; -#define true 1 -#define false 0 -#endif -#endif - #ifndef byte #define byte signed char #endif