diff --git a/HISTORY b/HISTORY index 24d03cc..0857961 100644 --- a/HISTORY +++ b/HISTORY @@ -1,7 +1,7 @@ -Version 5.07 2015-07-22 +Version 5.07 2015-08-07 * schedule task add the "second" field - * make.sh changed, you must upgrade libfastcommon to V1.18 or later + * make.sh changed, you must upgrade libfastcommon to V1.20 or later Version 5.06 2015-05-12 * compile passed in mac OS Darwin diff --git a/common/fdfs_global.c b/common/fdfs_global.c index de09df6..69bcf62 100644 --- a/common/fdfs_global.c +++ b/common/fdfs_global.c @@ -23,7 +23,7 @@ int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT; int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT; char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'}; -Version g_fdfs_version = {5, 6}; +Version g_fdfs_version = {5, 7}; bool g_use_connection_pool = false; ConnectionPool g_connection_pool; int g_connection_pool_max_idle_time = 3600; diff --git a/make.sh b/make.sh index 9c75959..70649be 100755 --- a/make.sh +++ b/make.sh @@ -63,11 +63,11 @@ else CFLAGS="$CFLAGS -O3" fi -LIBS='' +LIBS='-lm' if [ $OS_BITS -eq 64 ]; then - LIBS='-L/usr/lib64' + LIBS="$LIBS -L/usr/lib64" else - LIBS='-L/usr/lib' + LIBS="$LIBS -L/usr/lib" fi uname=$(uname)