You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ji...@apache.org on 2009/10/13 17:51:48 UTC
svn commit: r824818 - in /apr/apr/branches/1.4.x: build/apr_hints.m4
configure.in include/apr.h.in
Author: jim
Date: Tue Oct 13 15:51:48 2009
New Revision: 824818
URL: http://svn.apache.org/viewvc?rev=824818&view=rev
Log:
Just punt for now...
Modified:
apr/apr/branches/1.4.x/build/apr_hints.m4
apr/apr/branches/1.4.x/configure.in
apr/apr/branches/1.4.x/include/apr.h.in
Modified: apr/apr/branches/1.4.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_hints.m4?rev=824818&r1=824817&r2=824818&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_hints.m4 Tue Oct 13 15:51:48 2009
@@ -203,9 +203,6 @@
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*)
Modified: apr/apr/branches/1.4.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=824818&r1=824817&r2=824818&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Tue Oct 13 15:51:48 2009
@@ -40,10 +40,6 @@
#define BEOS_BONE 1
#endif
-#ifdef DARWIN_10
-#include "../darwin/apr_darwin_types.h"
-#endif
-
/*
* Include common private declarations.
*/
@@ -1749,6 +1745,15 @@
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
Modified: apr/apr/branches/1.4.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.h.in?rev=824818&r1=824817&r2=824818&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.h.in (original)
+++ apr/apr/branches/1.4.x/include/apr.h.in Tue Oct 13 15:51:48 2009
@@ -277,18 +277,8 @@
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 @@
#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 gid_t;
#endif
-#include "apr_os_override.h"
-
#ifdef __cplusplus
}
#endif