Commit 8977eafa authored by 黄振令's avatar 黄振令

1.编译错误解决

parent 461bdffa
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "kk_log.h" #include "kk_log.h"
#include "kk_hal.h" #include "kk_hal.h"
#include "mqtt_api.h" #include "mqtt_api.h"
#if CONFIG_NX5_PLATFORM
static pthread_mutex_t s_data_mutex; static pthread_mutex_t s_data_mutex;
extern int kk_get_gw_status(void); extern int kk_get_gw_status(void);
#define TO_OLED_NANOMSG_SOCKET_ADDR "ipc:///tmp/oled_pair.ipc" #define TO_OLED_NANOMSG_SOCKET_ADDR "ipc:///tmp/oled_pair.ipc"
...@@ -43,7 +44,7 @@ static int kk_info_get(char *str) ...@@ -43,7 +44,7 @@ static int kk_info_get(char *str)
char ccuid[32] = {0}; char ccuid[32] = {0};
char pid[32] = {0}; char pid[32] = {0};
char key[128] = {0}; char key[128] = {0};
if(str == NULL){ if(str == NULL){
return -1; return -1;
} }
...@@ -128,7 +129,7 @@ static int kk_info_get(char *str) ...@@ -128,7 +129,7 @@ static int kk_info_get(char *str)
return ret; return ret;
} }
//static int //static int
void *kk_info_nanomsg_send(void *data) void *kk_info_nanomsg_send(void *data)
{ {
int ret = 0; int ret = 0;
...@@ -169,4 +170,5 @@ int kk_info_report_start(void) ...@@ -169,4 +170,5 @@ int kk_info_report_start(void)
} }
pthread_attr_destroy(&info_report_attr); pthread_attr_destroy(&info_report_attr);
return 0; return 0;
} }
\ No newline at end of file #endif
\ No newline at end of file
...@@ -10,6 +10,12 @@ ifeq ($(CONFIG_MODEL),x86) ...@@ -10,6 +10,12 @@ ifeq ($(CONFIG_MODEL),x86)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_ubuntu LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_ubuntu
else ifeq ($(CONFIG_MODEL),nx5) else ifeq ($(CONFIG_MODEL),nx5)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_nx5 LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_nx5
else ifeq ($(CONFIG_MODEL),8197)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_8197
else ifeq ($(CONFIG_MODEL),a133)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133
else ifeq ($(CONFIG_MODEL),a133_ndk)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133
else else
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg
endif endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment