You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2005/01/20 10:03:30 UTC

svn commit: r125742 - /apr/apr-util/trunk/include/apr_ldap.h.in /apr/apr-util/trunk/include/apr_ldap.hnw /apr/apr-util/trunk/include/apr_ldap.hw /apr/apr-util/trunk/include/apr_ldap_init.h /apr/apr-util/trunk/include/apr_ldap_option.h /apr/apr-util/trunk/include/apr_ldap_url.h

Author: minfrin
Date: Thu Jan 20 01:03:27 2005
New Revision: 125742

URL: http://svn.apache.org/viewcvs?view=rev&rev=125742
Log:
Add C++ extern wrappers to the LDAP functions

Modified:
   apr/apr-util/trunk/include/apr_ldap.h.in
   apr/apr-util/trunk/include/apr_ldap.hnw
   apr/apr-util/trunk/include/apr_ldap.hw
   apr/apr-util/trunk/include/apr_ldap_init.h
   apr/apr-util/trunk/include/apr_ldap_option.h
   apr/apr-util/trunk/include/apr_ldap_url.h

Modified: apr/apr-util/trunk/include/apr_ldap.h.in
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.h.in?view=diff&rev=125742&p1=apr/apr-util/trunk/include/apr_ldap.h.in&r1=125741&p2=apr/apr-util/trunk/include/apr_ldap.h.in&r2=125742
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in	(original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in	Thu Jan 20 01:03:27 2005
@@ -95,6 +95,9 @@
 #error Support for LDAP v2.0 toolkits has been removed from apr-util. Please use an LDAP v3.0 toolkit.
 #endif 
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /**
  * This structure allows the C LDAP API error codes to be returned
@@ -106,6 +109,10 @@
     const char *msg;
     int rc;
 } apr_ldap_err_t;
+
+#ifdef __cplusplus
+}
+#endif
 
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"

Modified: apr/apr-util/trunk/include/apr_ldap.hnw
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.hnw?view=diff&rev=125742&p1=apr/apr-util/trunk/include/apr_ldap.hnw&r1=125741&p2=apr/apr-util/trunk/include/apr_ldap.hnw&r2=125742
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hnw	(original)
+++ apr/apr-util/trunk/include/apr_ldap.hnw	Thu Jan 20 01:03:27 2005
@@ -97,6 +97,9 @@
 #error Support for LDAP v2.0 toolkits has been removed from apr-util. Please use an LDAP v3.0 toolkit.
 #endif 
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /**
  * This structure allows the C LDAP API error codes to be returned
@@ -108,6 +111,10 @@
     const char *msg;
     int rc;
 } apr_ldap_err_t;
+
+#ifdef __cplusplus
+}
+#endif
 
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"

Modified: apr/apr-util/trunk/include/apr_ldap.hw
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.hw?view=diff&rev=125742&p1=apr/apr-util/trunk/include/apr_ldap.hw&r1=125741&p2=apr/apr-util/trunk/include/apr_ldap.hw&r2=125742
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hw	(original)
+++ apr/apr-util/trunk/include/apr_ldap.hw	Thu Jan 20 01:03:27 2005
@@ -98,6 +98,9 @@
 #error Support for LDAP v2.0 toolkits has been removed from apr-util. Please use an LDAP v3.0 toolkit.
 #endif 
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /**
  * This structure allows the C LDAP API error codes to be returned
@@ -109,6 +112,10 @@
     const char *msg;
     int rc;
 } apr_ldap_err_t;
+
+#ifdef __cplusplus
+}
+#endif
 
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"

Modified: apr/apr-util/trunk/include/apr_ldap_init.h
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap_init.h?view=diff&rev=125742&p1=apr/apr-util/trunk/include/apr_ldap_init.h&r1=125741&p2=apr/apr-util/trunk/include/apr_ldap_init.h&r2=125742
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_init.h	(original)
+++ apr/apr-util/trunk/include/apr_ldap_init.h	Thu Jan 20 01:03:27 2005
@@ -30,6 +30,10 @@
 
 #if APR_HAS_LDAP
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * APR LDAP SSL Initialise function
  *
@@ -120,6 +124,10 @@
  */
 APU_DECLARE(int) apr_ldap_info(apr_pool_t *pool,
                                apr_ldap_err_t **result_err);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* APR_HAS_LDAP */
 

Modified: apr/apr-util/trunk/include/apr_ldap_option.h
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap_option.h?view=diff&rev=125742&p1=apr/apr-util/trunk/include/apr_ldap_option.h&r1=125741&p2=apr/apr-util/trunk/include/apr_ldap_option.h&r2=125742
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_option.h	(original)
+++ apr/apr-util/trunk/include/apr_ldap_option.h	Thu Jan 20 01:03:27 2005
@@ -30,6 +30,10 @@
 
 #if APR_HAS_LDAP
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*
  * The following defines handle the different TLS certificate
  * options available. If these options are missing, APR will try and
@@ -177,6 +181,10 @@
                                      int option,
                                      const void *invalue,
                                      apr_ldap_err_t **result_err);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* APR_HAS_LDAP */
 

Modified: apr/apr-util/trunk/include/apr_ldap_url.h
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap_url.h?view=diff&rev=125742&p1=apr/apr-util/trunk/include/apr_ldap_url.h&r1=125741&p2=apr/apr-util/trunk/include/apr_ldap_url.h&r2=125742
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_url.h	(original)
+++ apr/apr-util/trunk/include/apr_ldap_url.h	Thu Jan 20 01:03:27 2005
@@ -31,6 +31,10 @@
 #include "apu.h"
 #include "apr_pools.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /** Structure to access an exploded LDAP URL */
 typedef struct apr_ldap_url_desc_t {
     struct  apr_ldap_url_desc_t  *lud_next;
@@ -100,6 +104,10 @@
                                     const char *url_in,
                                     apr_ldap_url_desc_t **ludpp,
                                     apr_ldap_err_t **result_err);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* APR_HAS_LDAP */