diff options
| author | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2019-03-22 12:23:52 +0000 |
|---|---|---|
| committer | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2019-03-22 12:23:52 +0000 |
| commit | 71eacc9b073111d660394d15263895204c1ce349 (patch) | |
| tree | f660ed180e625a42370f980964577a398d0a2df7 | |
| parent | 6bb6ce6b36efa887d53b25fa1f793770f6de1cf5 (diff) | |
| download | libapr-71eacc9b073111d660394d15263895204c1ce349.tar.gz | |
Don't mangle Darwin's native [U]INT64_C macros.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1856043 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr.h.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/apr.h.in b/include/apr.h.in index 130f162b5..e7193d77b 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -365,24 +365,28 @@ typedef unsigned @int_value@ apr_uint32_t; */ #ifdef DARWIN_10 #undef APR_SIZEOF_VOIDP -#undef INT64_C -#undef UINT64_C +#undef APR_INT64_C +#undef APR_UINT64_C #ifdef __LP64__ typedef long apr_int64_t; typedef unsigned long apr_uint64_t; #define APR_SIZEOF_VOIDP 8 - #define INT64_C(v) (v ## L) - #define UINT64_C(v) (v ## UL) + #define APR_INT64_C(v) (v ## L) + #define APR_UINT64_C(v) (v ## UL) #else typedef long long apr_int64_t; typedef unsigned long long apr_uint64_t; #define APR_SIZEOF_VOIDP 4 - #define INT64_C(v) (v ## LL) - #define UINT64_C(v) (v ## ULL) + #define APR_INT64_C(v) (v ## LL) + #define APR_UINT64_C(v) (v ## ULL) #endif #else typedef @int64_value@ apr_int64_t; typedef @uint64_value@ apr_uint64_t; + + /* Mechanisms to properly type numeric literals */ + @int64_literal@ + @uint64_literal@ #endif typedef @size_t_value@ apr_size_t; @@ -402,10 +406,6 @@ typedef apr_int32_t apr_intptr_t; /* Are we big endian? */ #define APR_IS_BIGENDIAN @bigendian@ -/* Mechanisms to properly type numeric literals */ -@int64_literal@ -@uint64_literal@ - #ifdef INT16_MIN #define APR_INT16_MIN INT16_MIN #else |