diff options
author | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-13 15:51:48 +0000 |
---|---|---|
committer | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-13 15:51:48 +0000 |
commit | 8397fcce8f906880aa83630608fb5106b3d7e847 (patch) | |
tree | c72c416badb49e8ecbc6773ad72d0cad53c116d4 | |
parent | f74e4b67f19738e95ce2b58ed6ca455101e93ad5 (diff) | |
download | libapr-8397fcce8f906880aa83630608fb5106b3d7e847.tar.gz |
Just punt for now...
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@824818 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | build/apr_hints.m4 | 3 | ||||
-rw-r--r-- | configure.in | 13 | ||||
-rw-r--r-- | include/apr.h.in | 30 |
3 files changed, 13 insertions, 33 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index 25d1e4d5d..680cbf4b6 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -203,9 +203,6 @@ dnl # Not a problem in 10.20. Otherwise, who knows? APR_SETIFNULL(ac_cv_func_kqueue, [no]) APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332 ;; - *-apple-darwin10.*) - APR_ADDTO(CPPFLAGS, [-DDARWIN_10]) - ;; esac ;; *-dec-osf*) diff --git a/configure.in b/configure.in index df7de7790..54c820e6b 100644 --- a/configure.in +++ b/configure.in @@ -40,10 +40,6 @@ AH_BOTTOM([ #define BEOS_BONE 1 #endif -#ifdef DARWIN_10 -#include "../darwin/apr_darwin_types.h" -#endif - /* * Include common private declarations. */ @@ -1749,6 +1745,15 @@ elif test "$ac_cv_type_off_t" = "yes"; then else AC_ERROR([could not determine the size of off_t]) fi + # Per OS tuning... + case $host in + *apple-darwin10.*) + # off_t is a long long, but long == long long + if test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_long_long"; then + off_t_fmt='#define APR_OFF_T_FMT "lld"' + fi + ;; + esac else # Fallback on int off_t_value=apr_int32_t diff --git a/include/apr.h.in b/include/apr.h.in index 5cb9eb7e9..9f1fb6f99 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -277,18 +277,8 @@ typedef unsigned @short_value@ apr_uint16_t; typedef @int_value@ apr_int32_t; typedef unsigned @int_value@ apr_uint32_t; -#ifdef DARWIN_10 -#ifdef __LP64__ - typedef long apr_int64_t; - typedef unsigned long apr_uint64_t; -#else - typedef long long apr_int64_t; - typedef unsigned long long apr_uint64_t; -#endif -#else - typedef @long_value@ apr_int64_t; - typedef unsigned @long_value@ apr_uint64_t; -#endif +typedef @long_value@ apr_int64_t; +typedef unsigned @long_value@ apr_uint64_t; typedef @size_t_value@ apr_size_t; typedef @ssize_t_value@ apr_ssize_t; @@ -308,18 +298,8 @@ typedef apr_uint32_t apr_uintptr_t; #define APR_IS_BIGENDIAN @bigendian@ /* Mechanisms to properly type numeric literals */ -#ifdef DARWIN_10 -#ifdef __LP64__ - #define APR_INT64_C(val) (val##L) - #define APR_UINT64_C(val) (val##UL) -#else - #define APR_INT64_C(val) (val##LL) - #define APR_UINT64_C(val) (val##ULL) -#endif -#else - @int64_literal@ - @uint64_literal@ -#endif +@int64_literal@ +@uint64_literal@ #ifdef INT16_MIN #define APR_INT16_MIN INT16_MIN @@ -525,8 +505,6 @@ typedef int uid_t; typedef int gid_t; #endif -#include "apr_os_override.h" - #ifdef __cplusplus } #endif |