diff options
| author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:24:08 +0900 |
|---|---|---|
| committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:25:02 +0900 |
| commit | 8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8 (patch) | |
| tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /ares_build.h.in | |
| parent | ccccebb78520ec3a26a18370936516b12ae5d53a (diff) | |
| parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
| download | c-ares-submit/tizen_4.0_base/20170828.000001.tar.gz c-ares-submit/tizen_4.0_base/20170828.000001.tar.bz2 c-ares-submit/tizen_4.0_base/20170828.000001.zip | |
Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019
Conflicts:
packaging/c-ares.spec
Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
Diffstat (limited to 'ares_build.h.in')
| -rw-r--r-- | ares_build.h.in | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ares_build.h.in b/ares_build.h.in index 227782c..e582523 100644 --- a/ares_build.h.in +++ b/ares_build.h.in @@ -50,21 +50,11 @@ /* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */ /* ================================================================ */ -#ifdef CARES_SIZEOF_LONG -# error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h" - Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined -#endif - #ifdef CARES_TYPEOF_ARES_SOCKLEN_T # error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h" Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined #endif -#ifdef CARES_SIZEOF_ARES_SOCKLEN_T -# error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h" - Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined -#endif - /* ================================================================ */ /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ /* ================================================================ */ @@ -95,15 +85,9 @@ # include <sys/socket.h> #endif -/* The size of `long', as computed by sizeof. */ -#undef CARES_SIZEOF_LONG - /* Integral data type used for ares_socklen_t. */ #undef CARES_TYPEOF_ARES_SOCKLEN_T -/* The size of `ares_socklen_t', as computed by sizeof. */ -#undef CARES_SIZEOF_ARES_SOCKLEN_T - /* Data type definition of ares_socklen_t. */ typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t; |