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 /src | |
| parent | 6926aca89a1187567bcec41df4e7be7715315114 (diff) | |
安装依赖头文件
Diffstat (limited to 'src')
| -rw-r--r-- | src/dns.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
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; |