svn commit: r892915 - in /apr/apr/trunk: configure.in include/arch/netware/apr_private.h include/arch/win32/apr_private.h

[wr...@apache.org]

Author: wrowe
Date: Mon Dec 21 18:19:43 2009
New Revision: 892915

URL: http://svn.apache.org/viewvc?rev=892915&view=rev
Log:
Ensure all platforms are consistent in including apr.h within apr_private.h

Modified:
    apr/apr/trunk/configure.in
    apr/apr/trunk/include/arch/netware/apr_private.h
    apr/apr/trunk/include/arch/win32/apr_private.h

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=892915&r1=892914&r2=892915&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Mon Dec 21 18:19:43 2009
@@ -38,6 +38,11 @@
 AH_TOP([
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
+
+/* Pick up publicly advertised headers and symbols before the
+ * APR internal private headers and symbols
+ */
+#include <apr.h>
 ])
 
 dnl Hard-coded inclusion at the tail end of apr_private.h:

Modified: apr/apr/trunk/include/arch/netware/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/netware/apr_private.h?rev=892915&r1=892914&r2=892915&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/netware/apr_private.h (original)
+++ apr/apr/trunk/include/arch/netware/apr_private.h Mon Dec 21 18:19:43 2009
@@ -23,6 +23,14 @@
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
 
+/* Pick up publicly advertised headers and symbols before the
+ * APR internal private headers and symbols
+ */
+#include <apr.h>
+
+/* Pick up privately consumed headers */
+#include <ndkvers.h>
+
 /* Use this section to define all of the HAVE_FOO_H
  * that are required to build properly.
  */
@@ -60,7 +68,6 @@
  * Hack around older NDKs which have only the getpassword() function,
  * a threadsafe, API-equivilant of getpass_r().
  */
-#include <ndkvers.h>
 #if (CURRENT_NDK_THRESHOLD < 709060000)
 #define getpass_r getpassword
 #endif
@@ -196,7 +203,6 @@
 /*
  * check for newer NDKs which use now correctly 'const char*' with iconv.
  */
-#include <ndkvers.h>
 #if (CURRENT_NDK_THRESHOLD >= 705110000)
 #define APU_ICONV_INBUF_CONST
 #endif

Modified: apr/apr/trunk/include/arch/win32/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_private.h?rev=892915&r1=892914&r2=892915&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_private.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_private.h Mon Dec 21 18:19:43 2009
@@ -23,10 +23,10 @@
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
 
-/* Include the public APR symbols, include our idea of the 'right'
- * subset of the Windows.h header.  This saves us repetition.
+/* Pick up publicly advertised headers and symbols before the
+ * APR internal private headers and symbols
  */
-#include "apr.h"
+#include <apr.h>
 
 /* 
  * Add a _very_few_ declarations missing from the restricted set of headers