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:55:51 UTC
svn commit: r824821 - in /apr/apr/trunk: build/apr_hints.m4 configure.in
include/apr.h.in
Author: jim
Date: Tue Oct 13 15:55:51 2009
New Revision: 824821
URL: http://svn.apache.org/viewvc?rev=824821&view=rev
Log:
Punt
Modified:
apr/apr/trunk/build/apr_hints.m4
apr/apr/trunk/configure.in
apr/apr/trunk/include/apr.h.in
Modified: apr/apr/trunk/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_hints.m4?rev=824821&r1=824820&r2=824821&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_hints.m4 (original)
+++ apr/apr/trunk/build/apr_hints.m4 Tue Oct 13 15:55:51 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/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=824821&r1=824820&r2=824821&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Oct 13 15:55:51 2009
@@ -49,10 +49,6 @@
#define BEOS_BONE 1
#endif
-#ifdef DARWIN_10
-#include "../darwin/apr_darwin_types.h"
-#endif
-
/*
* Include common private declarations.
*/
Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=824821&r1=824820&r2=824821&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Tue Oct 13 15:55:51 2009
@@ -278,18 +278,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 @size_t_value@ apr_size_t;
typedef @ssize_t_value@ apr_ssize_t;
@@ -516,8 +506,6 @@
typedef int gid_t;
#endif
-#include "apr_os_override.h"
-
#ifdef __cplusplus
}
#endif