test programs compile OK.
parent
522bd50522
commit
6befb09fe5
2
HISTORY
2
HISTORY
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
Version 6.09 2022-09-11
|
||||
* use libfastcommon V1.60 and libserverframe 1.1.18
|
||||
* use libfastcommon V1.60 and libserverframe 1.1.19
|
||||
|
||||
Version 6.08 2022-06-21
|
||||
* use libfastcommon V1.56
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
COMPILE = $(CC) -g -Wall -O -D_FILE_OFFSET_BITS=64 -DDEBUG
|
||||
INC_PATH = -I/usr/local/include
|
||||
LIB_PATH = -L/usr/local/lib -lfdfsclient -lfastcommon
|
||||
LIB_PATH = -L/usr/local/lib -lfdfsclient -lfastcommon -lserverframe
|
||||
TARGET_PATH = $(TARGET_PREFIX)/bin
|
||||
|
||||
SHARED_OBJS = common_func.o dfs_func.o
|
||||
#SHARED_OBJS = common_func.o dfs_func_pc.o
|
||||
#SHARED_OBJS = common_func.o dfs_func.o
|
||||
SHARED_OBJS = common_func.o dfs_func_pc.o
|
||||
|
||||
ALL_OBJS = $(SHARED_OBJS)
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ static ConnectionInfo *getConnectedStorageServer(
|
|||
if (pServer->sock < 0)
|
||||
{
|
||||
*err_no = conn_pool_connect_server(pServer, \
|
||||
g_fdfs_connect_timeout);
|
||||
SF_G_CONNECT_TIMEOUT);
|
||||
if (*err_no != 0)
|
||||
{
|
||||
return NULL;
|
||||
|
|
@ -47,7 +47,7 @@ static ConnectionInfo *getConnectedStorageServer(
|
|||
memcpy(pServer, pStorageServer, sizeof(ConnectionInfo));
|
||||
pServer->sock = -1;
|
||||
if ((*err_no=conn_pool_connect_server(pServer, \
|
||||
g_fdfs_connect_timeout)) != 0)
|
||||
SF_G_CONNECT_TIMEOUT)) != 0)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue