diff --git a/Platform/common/ulog/ulog_in.h b/Platform/common/ulog/ulog_in.h index b24fa1203..43320c20f 100755 --- a/Platform/common/ulog/ulog_in.h +++ b/Platform/common/ulog/ulog_in.h @@ -1,6 +1,7 @@ #ifndef _ULOG_IN_H #define _ULOG_IN_H +#include #include #include "common_types.h" diff --git a/Platform/user/configm/config-server/log_config/log_config_cm.c b/Platform/user/configm/config-server/log_config/log_config_cm.c index 2b5154e62..98b39eb48 100755 --- a/Platform/user/configm/config-server/log_config/log_config_cm.c +++ b/Platform/user/configm/config-server/log_config/log_config_cm.c @@ -1,5 +1,6 @@ #include "log_config_cm.h" #include "rpc_server.h" +#include "rpc_client.h" ret_code log_rpc_exec(char* service_name, char* method_name, pointer input, int input_len, int last_lenth) { diff --git a/Platform/user/configm/config-server/log_config/log_config_cm.h b/Platform/user/configm/config-server/log_config/log_config_cm.h index dbd1dfcb6..85c3cc0db 100755 --- a/Platform/user/configm/config-server/log_config/log_config_cm.h +++ b/Platform/user/configm/config-server/log_config/log_config_cm.h @@ -24,7 +24,7 @@ cJSON *json_obj = cJSON_Parse(input); \ if(!json_obj) { \ ULOG_ERR(g_log_h, "Error log %s format", str_conf); \ - return RET_INPUTERR; \ + return RET_INPUTERR; \ } \ \ ULOG_DEBUG(g_log_h, "json input: %s", cJSON_Print(json_obj)); \ diff --git a/Platform/user/configm/config-server/log_config/log_config_file.c b/Platform/user/configm/config-server/log_config/log_config_file.c index 9f7d7dd96..24211c99f 100755 --- a/Platform/user/configm/config-server/log_config/log_config_file.c +++ b/Platform/user/configm/config-server/log_config/log_config_file.c @@ -1,9 +1,9 @@ #include "log_config.h" #include "log_config_cm.h" -#define FILE_JSON(s, o) { \ +#define FILE_JSON(s, o) { \ s2j_struct_get_basic_element(s, o, int, level); \ - S2J_STRUCT_GET_STRING_ELEMENT_N(s, o, path, MAX_PATH_SZ); \ + S2J_STRUCT_GET_STRING_ELEMENT_N(s, o, path, MAX_PATH_SZ); \ s2j_struct_get_basic_element(s, o, int, is_compress); \ s2j_struct_get_basic_element(s, o, int, del_over_days); \ s2j_struct_get_basic_element(s, o, int, del_over_size); \ diff --git a/Platform/user/ulog/log-sched/log_file.c b/Platform/user/ulog/log-sched/log_file.c index 777dc0039..e45d55a4b 100755 --- a/Platform/user/ulog/log-sched/log_file.c +++ b/Platform/user/ulog/log-sched/log_file.c @@ -4,6 +4,7 @@ #include "log_file.h" #include "log_common.h" #include "ulog_in.h" +#include "rpc_conn.h" #define LOG_CONF_FILE_NAME "log-file.conf" diff --git a/Platform/user/ulog/log-sched/log_remote.c b/Platform/user/ulog/log-sched/log_remote.c index 98d7b0204..8a9e2010d 100755 --- a/Platform/user/ulog/log-sched/log_remote.c +++ b/Platform/user/ulog/log-sched/log_remote.c @@ -1,14 +1,14 @@ #include +#include #include #include #include #include - #include "log_remote.h" #include "log_common.h" #include "ulog_in.h" - +#include "rpc_conn.h" #define LOG_CONF_REMOTE_FILE_NAME "log-remote.conf"