apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r891835 - in /apr/apr/trunk: dbd/ include/ ldap/ util-misc/ xlate/ xml/
Date Thu, 17 Dec 2009 18:51:25 GMT
Author: wrowe
Date: Thu Dec 17 18:51:24 2009
New Revision: 891835

URL: http://svn.apache.org/viewvc?rev=891835&view=rev
Log:
Refactoring to drop apr_config.h, renamed APU_MODULE_DECLARE_DATA

Modified:
    apr/apr/trunk/dbd/apr_dbd.c
    apr/apr/trunk/dbd/apr_dbd_freetds.c
    apr/apr/trunk/dbd/apr_dbd_mysql.c
    apr/apr/trunk/dbd/apr_dbd_odbc.c
    apr/apr/trunk/dbd/apr_dbd_oracle.c
    apr/apr/trunk/dbd/apr_dbd_pgsql.c
    apr/apr/trunk/dbd/apr_dbd_sqlite2.c
    apr/apr/trunk/dbd/apr_dbd_sqlite3.c
    apr/apr/trunk/include/apr.h.in
    apr/apr/trunk/include/apr.hnw
    apr/apr/trunk/include/apr.hw
    apr/apr/trunk/include/apu.h.in
    apr/apr/trunk/include/apu.hnw
    apr/apr/trunk/include/apu.hw
    apr/apr/trunk/ldap/apr_ldap_init.c
    apr/apr/trunk/ldap/apr_ldap_option.c
    apr/apr/trunk/ldap/apr_ldap_rebind.c
    apr/apr/trunk/ldap/apr_ldap_stub.c
    apr/apr/trunk/util-misc/apu_dso.c
    apr/apr/trunk/xlate/xlate.c
    apr/apr/trunk/xml/apr_xml.c

Modified: apr/apr/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd.c (original)
+++ apr/apr/trunk/dbd/apr_dbd.c Thu Dec 17 18:51:24 2009
@@ -17,9 +17,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "apu_config.h"
 #include "apu.h"
-
+#include "apr_private.h"
 #include "apr_pools.h"
 #include "apr_dso.h"
 #include "apr_strings.h"

Modified: apr/apr/trunk/dbd/apr_dbd_freetds.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_freetds.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_freetds.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_freetds.c Thu Dec 17 18:51:24 2009
@@ -15,7 +15,7 @@
  */
 
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 /* COMPILE_STUBS: compile stubs for unimplemented functions.
  *
@@ -764,7 +764,7 @@
 }
 #endif
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = {
     "freetds",
     dbd_freetds_init,
     dbd_freetds_native,

Modified: apr/apr/trunk/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_mysql.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_mysql.c Thu Dec 17 18:51:24 2009
@@ -19,7 +19,7 @@
 #if APU_HAVE_MYSQL
 
 #include "apu_version.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -1291,7 +1291,7 @@
     /* FIXME: this is a guess; find out what it really does */
     apr_pool_cleanup_register(pool, NULL, thread_end, apr_pool_cleanup_null);
 }
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
     "mysql",
     dbd_mysql_init,
     dbd_mysql_native,

Modified: apr/apr/trunk/dbd/apr_dbd_odbc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_odbc.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_odbc.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_odbc.c Thu Dec 17 18:51:24 2009
@@ -15,6 +15,7 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 #if APU_HAVE_ODBC
 
 #include "apr.h"
@@ -26,7 +27,6 @@
 #include "apr_dbd_internal.h"
 #include "apr_thread_proc.h"
 #include "apu_version.h"
-#include "apu_config.h"
 
 #include <stdlib.h>
 

Modified: apr/apr/trunk/dbd/apr_dbd_oracle.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_oracle.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_oracle.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_oracle.c Thu Dec 17 18:51:24 2009
@@ -50,6 +50,7 @@
 #endif
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_ORACLE
 
@@ -2184,7 +2185,7 @@
     return res->nrows;
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_oracle_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_oracle_driver = {
     "oracle",
     dbd_oracle_init,
     dbd_oracle_native,

Modified: apr/apr/trunk/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_pgsql.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_pgsql.c Thu Dec 17 18:51:24 2009
@@ -15,11 +15,10 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_PGSQL
 
-#include "apu_config.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -1279,7 +1278,7 @@
     }
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
     "pgsql",
     NULL,
     dbd_pgsql_native,

Modified: apr/apr/trunk/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_sqlite2.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_sqlite2.c Thu Dec 17 18:51:24 2009
@@ -15,6 +15,7 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_SQLITE2
 
@@ -530,7 +531,7 @@
     return res->ntuples;
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
     "sqlite2",
     NULL,
     dbd_sqlite_native,

Modified: apr/apr/trunk/dbd/apr_dbd_sqlite3.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_sqlite3.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_sqlite3.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_sqlite3.c Thu Dec 17 18:51:24 2009
@@ -15,6 +15,7 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_SQLITE3
 
@@ -880,7 +881,7 @@
     return res->tuples;
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
     "sqlite3",
     NULL,
     dbd_sqlite3_native,

Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Thu Dec 17 18:51:24 2009
@@ -435,6 +435,27 @@
  */
 #define APR_DECLARE_DATA
 
+#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
+/**
+ * Declare a dso module's exported module structure as APR_MODULE_DECLARE_DATA.
+ *
+ * Unless APR_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APR_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APR_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APR_MODULE_DECLARE_DATA
+#else
+#define APR_MODULE_DECLARE_DATA           __declspec(dllexport)
+#endif
+
+/**
+ * @deprecated
+ * @see APR_MODULE_DECLARE_DATA
+ */
+#define APU_MODULE_DECLARE_DATA           APR_MODULE_DECLARE_DATA
+
 /* Define APR_SSIZE_T_FMT.  
  * If ssize_t is an integer we define it to be "d",
  * if ssize_t is a long int we define it to be "ld",

Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Thu Dec 17 18:51:24 2009
@@ -410,6 +410,27 @@
  */
 #define APR_DECLARE_DATA
 
+#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
+/**
+ * Declare a dso module's exported module structure as APR_MODULE_DECLARE_DATA.
+ *
+ * Unless APR_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APR_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APR_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APR_MODULE_DECLARE_DATA
+#else
+#define APR_MODULE_DECLARE_DATA           __declspec(dllexport)
+#endif
+
+/**
+ * @deprecated
+ * @see APR_MODULE_DECLARE_DATA
+ */
+#define APU_MODULE_DECLARE_DATA           APR_MODULE_DECLARE_DATA
+
 #define APR_SSIZE_T_FMT          "d"
 
 #define APR_SIZE_T_FMT           "d"

Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Thu Dec 17 18:51:24 2009
@@ -552,6 +552,27 @@
 #define APR_DECLARE_DATA             __declspec(dllimport)
 #endif
 
+#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
+/**
+ * Declare a dso module's exported module structure as APR_MODULE_DECLARE_DATA.
+ *
+ * Unless APR_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APR_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APR_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APR_MODULE_DECLARE_DATA
+#else
+#define APR_MODULE_DECLARE_DATA           __declspec(dllexport)
+#endif
+
+/**
+ * @deprecated
+ * @see APR_MODULE_DECLARE_DATA
+ */
+#define APU_MODULE_DECLARE_DATA           APR_MODULE_DECLARE_DATA
+
 #ifdef WIN64
 #define APR_SSIZE_T_FMT          "I64d"
 #define APR_SIZE_T_FMT           "I64u"

Modified: apr/apr/trunk/include/apu.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.h.in?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/include/apu.h.in (original)
+++ apr/apr/trunk/include/apu.h.in Thu Dec 17 18:51:24 2009
@@ -29,59 +29,6 @@
 #ifndef APU_H
 #define APU_H
 
-/**
- * APR_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library,
- * so that all public symbols are exported.
- *
- * APR_DECLARE_STATIC is defined when including the APR-UTIL public headers,
- * to provide static linkage when the dynamic library may be unavailable.
- *
- * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when
- * including the APR-UTIL public headers, to import and link the symbols from 
- * the dynamic APR-UTIL library and assure appropriate indirection and calling
- * conventions at compile time.
- */
-
-/**
- * The public APR-UTIL functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @fn APR_DECLARE(rettype) apr_func(args);
- */
-#define APR_DECLARE(type)            type
-/**
- * The public APR-UTIL functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must use the C language calling convention.
- *
- * @fn APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-/**
- * The public APR-UTIL variables are declared with APR_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @fn APR_DECLARE_DATA type apr_variable;
- * @note APR_DECLARE_DATA extern type apr_variable; syntax is required for
- * declarations within headers to properly import the variable.
- */
-#define APR_DECLARE_DATA
-
-#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
-/**
- * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
- *
- * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
- * declared with APU_MODULE_DECLARE_DATA are always exported.
- * @code
- * module APU_MODULE_DECLARE_DATA mod_tag
- * @endcode
- */
-#define APU_MODULE_DECLARE_DATA
-#else
-#define APU_MODULE_DECLARE_DATA           __declspec(dllexport)
-#endif
-
 /*
  * we always have SDBM (it's in our codebase)
  */

Modified: apr/apr/trunk/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.hnw?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/include/apu.hnw (original)
+++ apr/apr/trunk/include/apu.hnw Thu Dec 17 18:51:24 2009
@@ -30,56 +30,6 @@
  * @{
  */
 
-
-/**
- * APR_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library,
- * so that all public symbols are exported.
- *
- * APR_DECLARE_STATIC is defined when including the APR-UTIL public headers,
- * to provide static linkage when the dynamic library may be unavailable.
- *
- * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when
- * including the APR-UTIL public headers, to import and link the symbols from 
- * the dynamic APR-UTIL library and assure appropriate indirection and calling
- * conventions at compile time.
- */
-
-/**
- * The public APR-UTIL functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @fn APR_DECLARE(rettype) apr_func(args);
- */
-#define APR_DECLARE(type)            type
-/**
- * The public APR-UTIL functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must use the C language calling convention.
- *
- * @fn APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-/**
- * The public APR-UTIL variables are declared with APR_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @fn APR_DECLARE_DATA type apr_variable;
- * @note APR_DECLARE_DATA extern type apr_variable; syntax is required for
- * declarations within headers to properly import the variable.
- */
-#define APR_DECLARE_DATA
-
-/**
- * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
- *
- * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
- * declared with APU_MODULE_DECLARE_DATA are always exported.
- * @code
- * module APU_MODULE_DECLARE_DATA mod_tag
- * @endcode
- */
-#define APU_MODULE_DECLARE_DATA
-
 /*
  * we always have SDBM (it's in our codebase)
  */

Modified: apr/apr/trunk/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.hw?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/include/apu.hw (original)
+++ apr/apr/trunk/include/apu.hw Thu Dec 17 18:51:24 2009
@@ -29,73 +29,6 @@
 #ifndef APU_H
 #define APU_H
 
-/**
- * APR_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library,
- * so that all public symbols are exported.
- *
- * APR_DECLARE_STATIC is defined when including the APR-UTIL public headers,
- * to provide static linkage when the dynamic library may be unavailable.
- *
- * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when
- * including the APR-UTIL public headers, to import and link the symbols from 
- * the dynamic APR-UTIL library and assure appropriate indirection and calling
- * conventions at compile time.
- */
-
-#if defined(DOXYGEN) || !defined(WIN32)
-/**
- * The public APR-UTIL functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @fn APR_DECLARE(rettype) apr_func(args);
- */
-#define APR_DECLARE(type)            type
-/**
- * The public APR-UTIL functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must use the C language calling convention.
- *
- * @fn APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-/**
- * The public APR-UTIL variables are declared with APR_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @fn APR_DECLARE_DATA type apr_variable;
- * @note extern APR_DECLARE_DATA type apr_variable; syntax is required for
- * declarations within headers to properly import the variable.
- */
-#define APR_DECLARE_DATA
-#elif defined(APR_DECLARE_STATIC)
-#define APR_DECLARE(type)            type __stdcall
-#define APR_DECLARE_NONSTD(type)     type __cdecl
-#define APR_DECLARE_DATA
-#elif defined(APR_DECLARE_EXPORT)
-#define APR_DECLARE(type)            __declspec(dllexport) type __stdcall
-#define APR_DECLARE_NONSTD(type)     __declspec(dllexport) type __cdecl
-#define APR_DECLARE_DATA             __declspec(dllexport)
-#else
-#define APR_DECLARE(type)            __declspec(dllimport) type __stdcall
-#define APR_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
-#define APR_DECLARE_DATA             __declspec(dllimport)
-#endif
-
-#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
-/**
- * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
- *
- * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
- * declared with APU_MODULE_DECLARE_DATA are always exported.
- * @code
- * module APU_MODULE_DECLARE_DATA mod_tag
- * @endcode
- */
-#define APU_MODULE_DECLARE_DATA
-#else
-#define APU_MODULE_DECLARE_DATA           __declspec(dllexport)
-#endif
-
 /*
  * we always have SDBM (it's in our codebase)
  */

Modified: apr/apr/trunk/ldap/apr_ldap_init.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_init.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/ldap/apr_ldap_init.c (original)
+++ apr/apr/trunk/ldap/apr_ldap_init.c Thu Dec 17 18:51:24 2009
@@ -24,7 +24,7 @@
 
 #include "apr.h"
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 #if APR_HAVE_MODULAR_DSO
 #define APU_DSO_LDAP_BUILD
@@ -202,7 +202,7 @@
 /* For DSO builds, export the table of entry points into the apr_ldap DSO
  * See include/private/apu_internal.h for the corresponding declarations
  */
-APU_MODULE_DECLARE_DATA struct apr__ldap_dso_fntable apr__ldap_fns = {
+APR_MODULE_DECLARE_DATA struct apr__ldap_dso_fntable apr__ldap_fns = {
     apr_ldap_info,
     apr_ldap_init,
     apr_ldap_ssl_init,

Modified: apr/apr/trunk/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_option.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr/trunk/ldap/apr_ldap_option.c Thu Dec 17 18:51:24 2009
@@ -23,7 +23,7 @@
 
 #include "apr.h"
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 #if APR_HAVE_MODULAR_DSO
 #define APU_DSO_LDAP_BUILD

Modified: apr/apr/trunk/ldap/apr_ldap_rebind.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_rebind.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/ldap/apr_ldap_rebind.c (original)
+++ apr/apr/trunk/ldap/apr_ldap_rebind.c Thu Dec 17 18:51:24 2009
@@ -23,7 +23,7 @@
 
 #include "apr.h"
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 #if APR_HAVE_MODULAR_DSO
 #define APU_DSO_LDAP_BUILD

Modified: apr/apr/trunk/ldap/apr_ldap_stub.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_stub.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/ldap/apr_ldap_stub.c (original)
+++ apr/apr/trunk/ldap/apr_ldap_stub.c Thu Dec 17 18:51:24 2009
@@ -16,7 +16,7 @@
 
 #include "apr.h"
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 #include "apr_ldap.h"
 #include "apu_internal.h"
 #include "apr_dso.h"

Modified: apr/apr/trunk/util-misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_dso.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/util-misc/apu_dso.c (original)
+++ apr/apr/trunk/util-misc/apu_dso.c Thu Dec 17 18:51:24 2009
@@ -17,9 +17,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "apu_config.h"
 #include "apu.h"
-
+#include "apr_private.h"
 #include "apr_pools.h"
 #include "apr_tables.h"
 #include "apr_dso.h"

Modified: apr/apr/trunk/xlate/xlate.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xlate/xlate.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/xlate/xlate.c (original)
+++ apr/apr/trunk/xlate/xlate.c Thu Dec 17 18:51:24 2009
@@ -15,7 +15,7 @@
  */
 
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
 #include "apr_portable.h"

Modified: apr/apr/trunk/xml/apr_xml.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/apr_xml.c?rev=891835&r1=891834&r2=891835&view=diff
==============================================================================
--- apr/apr/trunk/xml/apr_xml.c (original)
+++ apr/apr/trunk/xml/apr_xml.c Thu Dec 17 18:51:24 2009
@@ -15,6 +15,7 @@
  */
 
 #include "apr.h"
+#include "apr_private.h"
 #include "apr_strings.h"
 
 #define APR_WANT_STDIO          /* for sprintf() */
@@ -23,8 +24,6 @@
 
 #include "apr_xml.h"
 
-#include "apu_config.h"
-
 #if defined(HAVE_XMLPARSE_XMLPARSE_H)
 #include <xmlparse/xmlparse.h>
 #elif defined(HAVE_XMLTOK_XMLPARSE_H)



Mime
View raw message