From 7bbf06cc6f35448c2413ecb839b81a9b117ee125 Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Mon, 25 Nov 2019 15:37:05 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E9=87=8D=E6=96=B0=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=85=8D=E7=BD=AE=20RCA=EF=BC=9A=20SOL?=
 =?UTF-8?q?=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Ahuangxin=20?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Ahuangxin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt            | 34 +++++++++++++++++++---------------
 confingure/prase_config.c |  3 +++
 log/log.c                 |  2 ++
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d83982c..d6ea61e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,20 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
-
-project(ztp_client)
-
-AUX_SOURCE_DIRECTORY(./log ZTP_SRC)
-AUX_SOURCE_DIRECTORY(./confingure ZTP_SRC)
-AUX_SOURCE_DIRECTORY(./http ZTP_SRC)
-AUX_SOURCE_DIRECTORY(./json_engine ZTP_SRC)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-
-LINK_LIBRARIES(-lpthread -lconfig -lcurl -lcjson)
-
-ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c)
-
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+
+if(PLAT_ARM64)
+INCLUDE(${CMAKE_SOURCE_DIR}/projects/arm64.cmake)
+endif()
+
+project(ztp_client)
+
+AUX_SOURCE_DIRECTORY(./log ZTP_SRC)
+AUX_SOURCE_DIRECTORY(./confingure ZTP_SRC)
+AUX_SOURCE_DIRECTORY(./http ZTP_SRC)
+AUX_SOURCE_DIRECTORY(./json_engine ZTP_SRC)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+
+LINK_LIBRARIES(-lpthread -lconfig -lcurl -lcjson)
+
+ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c)
+
 INCLUDE_DIRECTORIES("./include")
\ No newline at end of file
diff --git a/confingure/prase_config.c b/confingure/prase_config.c
index 9854057..e2577fd 100644
--- a/confingure/prase_config.c
+++ b/confingure/prase_config.c
@@ -5,8 +5,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
+
+#ifdef MONITOR_ZTP_CFG_FILE
 #include <sys/inotify.h>
 #include <errno.h>
+#endif
 
 #include "common.h"
 #include "log.h"
diff --git a/log/log.c b/log/log.c
index f98c2b4..3e9b580 100644
--- a/log/log.c
+++ b/log/log.c
@@ -212,6 +212,8 @@ static void *__logOutputThread(void *p)
     pthread_detach(pthread_self());
 
     g_bEnableLog = TRUE;
+
+    return NULL;
 }
 
 /**