apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661390 - in /apr/apr-util/trunk/include: apr_ldap.h.in apr_ldap.hw apu.hw private/apu_config.hw
Date Thu, 29 May 2008 16:43:24 GMT
Author: wrowe
Date: Thu May 29 09:43:24 2008
New Revision: 661390

URL: http://svn.apache.org/viewvc?rev=661390&view=rev
Log:
Sync .h.in to .hw files

Modified:
    apr/apr-util/trunk/include/apr_ldap.h.in
    apr/apr-util/trunk/include/apr_ldap.hw
    apr/apr-util/trunk/include/apu.hw
    apr/apr-util/trunk/include/private/apu_config.hw

Modified: apr/apr-util/trunk/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.h.in?rev=661390&r1=661389&r2=661390&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in (original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in Thu May 29 09:43:24 2008
@@ -103,7 +103,7 @@
  * For ldap function calls that input a size limit on the number of returned elements
  * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0)
  */
-#if APR_HAS_ZOS_LDAPSDK
+#if APR_HAS_ZOS_LDAPSDK || APR_HAS_MICROSOFT_LDAPSDK
 #define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
 #else
 #ifdef LDAP_DEFAULT_LIMIT
@@ -151,7 +151,16 @@
 }
 #endif
 
-#define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+/* The MS SDK returns LDAP_UNAVAILABLE when the backend has closed the connection
+ * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone 
+ * manually chooses another SDK on Windows 
+ */
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN \
+                                    || (s) == LDAP_UNAVAILABLE)
+#else
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN)
+#endif
 
 /* These symbols are not actually exported in a DSO build, but mapped into
  * a private exported function array for apr_ldap_stub to bind dynamically.

Modified: apr/apr-util/trunk/include/apr_ldap.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.hw?rev=661390&r1=661389&r2=661390&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hw (original)
+++ apr/apr-util/trunk/include/apr_ldap.hw Thu May 29 09:43:24 2008
@@ -40,6 +40,8 @@
 #define APR_HAS_MOZILLA_LDAPSDK     0
 #define APR_HAS_OPENLDAP_LDAPSDK    0
 #define APR_HAS_MICROSOFT_LDAPSDK   1
+#define APR_HAS_TIVOLI_LDAPSDK      0
+#define APR_HAS_ZOS_LDAPSDK         0
 #define APR_HAS_OTHER_LDAPSDK       0
 
 
@@ -56,9 +58,19 @@
  * apr_ldap_url_parse*() functions have been rewritten specifically for
  * APR, so the APR_HAS_LDAP_URL_PARSE macro is forced to zero.
  */
+#if APR_HAS_TIVOLI_LDAPSDK
+#define APR_HAS_LDAP_SSL 0
+#else
 #define APR_HAS_LDAP_SSL 1
+#endif
 #define APR_HAS_LDAP_URL_PARSE 0
 
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
 
 /*
  * Include the standard LDAP header files.
@@ -91,8 +103,25 @@
  * For ldap function calls that input a size limit on the number of returned elements
  * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0)
  */
+#if APR_HAS_ZOS_LDAPSDK || APR_HAS_MICROSOFT_LDAPSDK 
 #define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
+#else
+#ifdef LDAP_DEFAULT_LIMIT
+#define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT
+#else
+#define APR_LDAP_SIZELIMIT -1 /* equivalent to LDAP_DEFAULT_LIMIT */
+#endif
+#endif
 
+/*
+ * z/OS is missing some defines
+ */
+#ifndef LDAP_VERSION_MAX
+#define LDAP_VERSION_MAX  LDAP_VERSION
+#endif
+#if APR_HAS_ZOS_LDAPSDK
+#define LDAP_VENDOR_NAME "IBM z/OS"
+#endif
 
 /* Note: Macros defining const casting has been removed in APR v1.0,
  * pending real support for LDAP v2.0 toolkits.
@@ -126,12 +155,11 @@
  * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone 
  * manually chooses another SDK on Windows 
  */
-
 #if APR_HAS_MICROSOFT_LDAPSDK
-#define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
-                ||(s) == LDAP_UNAVAILABLE)
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN \
+                                    || (s) == LDAP_UNAVAILABLE)
 #else
-#define APR_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN)
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN)
 #endif
 
 /* These symbols are not actually exported in a DSO build, but mapped into

Modified: apr/apr-util/trunk/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apu.hw?rev=661390&r1=661389&r2=661390&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apu.hw (original)
+++ apr/apr-util/trunk/include/apu.hw Thu May 29 09:43:24 2008
@@ -15,13 +15,11 @@
  */
 
 /* 
- * Note: This is a Windows specific version of apu.h. It is renamed to
- * apu.h at the start of a Windows build.
+ * apu.h is duplicated from apu.hw at build time -- do not edit apu.h
  */
 /* @file apu.h
  * @brief APR-Utility main file
  */
-
 /**
  * @defgroup APR_Util APR Utility Functions
  * @{

Modified: apr/apr-util/trunk/include/private/apu_config.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/private/apu_config.hw?rev=661390&r1=661389&r2=661390&view=diff
==============================================================================
--- apr/apr-util/trunk/include/private/apu_config.hw (original)
+++ apr/apr-util/trunk/include/private/apu_config.hw Thu May 29 09:43:24 2008
@@ -24,6 +24,9 @@
 #ifndef APU_CONFIG_H
 #define APU_CONFIG_H
 
+/* Always compile win32 with DSO support */
+#define APU_DSO_BUILD           1
+
 /*
  * Windows does not have GDBM, and we always use the bundled (new) Expat
  */



Mime
View raw message