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 16:37:47 UTC
svn commit: r824788 - in /apr/apr/branches/1.4.x/include: apr.h.in
arch/darwin/apr_darwin_types.h
Author: jim
Date: Tue Oct 13 14:37:46 2009
New Revision: 824788
URL: http://svn.apache.org/viewvc?rev=824788&view=rev
Log:
More fluff on the darwin mojo... whatta pain. Maybe we
should just say gcc -arch i386 until this gets less bogus.
Modified:
apr/apr/branches/1.4.x/include/apr.h.in
apr/apr/branches/1.4.x/include/arch/darwin/apr_darwin_types.h
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=824788&r1=824787&r2=824788&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 14:37:46 2009
@@ -279,15 +279,15 @@
#ifdef DARWIN_10
#ifdef __LP64__
-typedef long apr_int64_t;
-typedef unsigned long apr_uint64_t;
+ 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;
+ 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;
+ typedef @long_value@ apr_int64_t;
+ typedef unsigned @long_value@ apr_uint64_t;
#endif
typedef @size_t_value@ apr_size_t;
@@ -308,8 +308,18 @@
#define APR_IS_BIGENDIAN @bigendian@
/* Mechanisms to properly type numeric literals */
-@int64_literal@
-@uint64_literal@
+#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
#ifdef INT16_MIN
#define APR_INT16_MIN INT16_MIN
Modified: apr/apr/branches/1.4.x/include/arch/darwin/apr_darwin_types.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/arch/darwin/apr_darwin_types.h?rev=824788&r1=824787&r2=824788&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/arch/darwin/apr_darwin_types.h (original)
+++ apr/apr/branches/1.4.x/include/arch/darwin/apr_darwin_types.h Tue Oct 13 14:37:46 2009
@@ -58,7 +58,7 @@
* So off_t is always long long
*/
#undef APR_OFF_T_STRFN
-#define APR_OFF_T_STRFN APR_INT64_STRFN
+#define APR_OFF_T_STRFN strtoll
#undef SETPGRP_VOID