apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661732 - in /apr/apr-util/branches/1.3.x: docs/doxygen.conf include/apu.h.in include/apu.hnw include/apu.hw ldap/apr_ldap_init.c
Date Fri, 30 May 2008 14:30:07 GMT
Author: wrowe
Date: Fri May 30 07:30:07 2008
New Revision: 661732

URL: http://svn.apache.org/viewvc?rev=661732&view=rev
Log:
Export the __fns array with an APU_MODULE_DECLARE_DATA,
which marks for export any data without respect for how
the APR_DECLARE macros are configured.  A module *imports*
apr-util-1 lib, but it's vtable must be *exported*.

Backport: 661731

Modified:
    apr/apr-util/branches/1.3.x/docs/doxygen.conf
    apr/apr-util/branches/1.3.x/include/apu.h.in
    apr/apr-util/branches/1.3.x/include/apu.hnw
    apr/apr-util/branches/1.3.x/include/apu.hw
    apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c

Modified: apr/apr-util/branches/1.3.x/docs/doxygen.conf
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/docs/doxygen.conf?rev=661732&r1=661731&r2=661732&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/docs/doxygen.conf (original)
+++ apr/apr-util/branches/1.3.x/docs/doxygen.conf Fri May 30 07:30:07 2008
@@ -14,6 +14,7 @@
 PREDEFINED="APU_DECLARE(x)=x" \
            "APU_DECLARE_NONSTD(x)=x" \
            "APU_DECLARE_DATA" \
+           "APU_MODULE_DECLARE_DATA" \
            "APU_DECLARE_LDAP(x)=x" \
            "APR_HAS_MMAP" \
            "APR_HAS_THREADS" \

Modified: apr/apr-util/branches/1.3.x/include/apu.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/apu.h.in?rev=661732&r1=661731&r2=661732&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/apu.h.in (original)
+++ apr/apr-util/branches/1.3.x/include/apu.h.in Fri May 30 07:30:07 2008
@@ -66,6 +66,22 @@
  * declarations within headers to properly import the variable.
  */
 #define APU_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-util/branches/1.3.x/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/apu.hnw?rev=661732&r1=661731&r2=661732&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/apu.hnw (original)
+++ apr/apr-util/branches/1.3.x/include/apu.hnw Fri May 30 07:30:07 2008
@@ -68,6 +68,18 @@
  * declarations within headers to properly import the variable.
  */
 #define APU_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-util/branches/1.3.x/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/apu.hw?rev=661732&r1=661731&r2=661732&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/apu.hw (original)
+++ apr/apr-util/branches/1.3.x/include/apu.hw Fri May 30 07:30:07 2008
@@ -80,6 +80,22 @@
 #define APU_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
 #define APU_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-util/branches/1.3.x/ldap/apr_ldap_init.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c?rev=661732&r1=661731&r2=661732&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c Fri May 30 07:30:07 2008
@@ -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_DECLARE_DATA struct apr__ldap_dso_fntable apr__ldap_fns = {
+APU_MODULE_DECLARE_DATA struct apr__ldap_dso_fntable apr__ldap_fns = {
     apr_ldap_info,
     apr_ldap_init,
     apr_ldap_ssl_init,



Mime
View raw message