cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 修正编译错误 

RCA：
SOL：
修改人：huangxin
检视人：huangxin
This commit is contained in:
黄昕 2019-08-12 16:35:47 +08:00
parent a21bcce9f5
commit f558d72165
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Product/build/user.usermanager-auth.Makefile
View File

@ -34,7 +34,7 @@ PLAT_LINUX_SRCS = $(COMMON_SRCS)
PLAT_ARM64_SRCS = $(COMMON_SRCS) PLAT_ARM64_SRCS = $(COMMON_SRCS)
# gcc CFLAGS # gcc CFLAGS
PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common -I../../Platform/common/database PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common -I../../Platform/common
PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)

12
Product/build/user.web-auth.Makefile
View File

@ -43,17 +43,17 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ./userauthapi-arm64.so ARM64_LIBS := ./userauthapi-arm64.so ./libdatabase-arm64.so
LINUX_LIBS := -lcjson ./userauthapi-linux.so LINUX_LIBS := -lcjson ./userauthapi-linux.so ./libdatabase-linux.so
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/userauthapi-arm64.so DEPEND_LIB += ./debug/userauthapi-arm64.so ../../Platform/build/debug/libdatabase-arm64.so
USER_CLEAN_ITEMS += ./userauthapi-arm64.so USER_CLEAN_ITEMS += ./userauthapi-arm64.so ./libdatabase-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ./debug/userauthapi-linux.so DEPEND_LIB += ./debug/userauthapi-linux.so ../../Platform/build/debug/libdatabase-linux.so
USER_CLEAN_ITEMS += ./userauthapi-linux.so USER_CLEAN_ITEMS += ./userauthapi-linux.so ./libdatabase-linux.so
endif endif
# this line must be at below of thus, because of... # this line must be at below of thus, because of...

2
Product/user/user_manager/usermanager-auth/user_auth.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <cjson/cJSON.h> #include <cjson/cJSON.h>
#include "user_auth.h" #include "user_auth.h"
#include "database.h" #include "database/database.h"
#define NOT_LOCK 0 #define NOT_LOCK 0
#define DATA_EMPTY 0 #define DATA_EMPTY 0