diff options
| author | liuxueli <[email protected]> | 2020-04-30 10:47:23 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-04-30 10:47:23 +0800 |
| commit | c8af64f3e169718f50fddb3c00c727be2f8a83c3 (patch) | |
| tree | f689c9f15e0dca9fdb0ac8d64d130a3b96a65670 | |
| parent | 6926aca89a1187567bcec41df4e7be7715315114 (diff) | |
安装依赖头文件
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | src/dns.cpp | 25 | ||||
| -rw-r--r-- | test/src/dns_test.c | 3 |
3 files changed, 5 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be8c2f2..b98dbaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/opt/MESA/lib/" - INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel libMESA_htable-devel libMESA_field_stat2-devel sapp-devel framework_env libMESA_prof_load-devel + INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp-devel framework_env libMESA_prof_load-devel sapp-devel stages: - build diff --git a/src/dns.cpp b/src/dns.cpp index dce9b39..bfacbc9 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -31,30 +31,9 @@ #include "dns.h" #include "dns_internal.h" -<<<<<<< .mine -int DNS_PROTOCOL_VERSION_20191212; +int DNS_PROTOCOL_VERSION_20200430; - - - - - - - - - - - - - - - - - - - -======= #ifdef __cplusplus extern "C" { @@ -77,7 +56,7 @@ static __attribute__((__used__)) const char * GIT_VERSION_UNKNOWN = NULL; #endif int DNS_PROTOCOL_VERSION_20191224; ->>>>>>> .theirs + unsigned long long dns_register_flag = 0; unsigned short dns_plugid = 0; static pthread_mutex_t dns_lock; diff --git a/test/src/dns_test.c b/test/src/dns_test.c index aaabfd3..80a416e 100644 --- a/test/src/dns_test.c +++ b/test/src/dns_test.c @@ -6,9 +6,10 @@ #include <assert.h> #include <MESA/stream.h> -#include <MESA/dns.h> #include <MESA/cJSON.h> +#include "dns.h" + #define LOG_PATH "./log/dns/" #define DEBUG 1 |