httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r536627 - in /httpd/httpd/branches/2.2.x: STATUS include/ap_listen.h include/ap_mpm.h include/ap_provider.h include/util_cfgtree.h include/util_ldap.h
Date Wed, 09 May 2007 19:35:46 GMT
Author: rpluem
Date: Wed May  9 12:35:45 2007
New Revision: 536627

URL: http://svn.apache.org/viewvc?view=rev&rev=536627
Log:
Merge r535169 from trunk:

* Add extern "C" linkage to several headers to make it easier to use
  them in C++ code.

PR: 42286
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem, wrowe, niq

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/include/ap_listen.h
    httpd/httpd/branches/2.2.x/include/ap_mpm.h
    httpd/httpd/branches/2.2.x/include/ap_provider.h
    httpd/httpd/branches/2.2.x/include/util_cfgtree.h
    httpd/httpd/branches/2.2.x/include/util_ldap.h

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=536627&r1=536626&r2=536627
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed May  9 12:35:45 2007
@@ -105,15 +105,6 @@
       (It also works for httpd-2.2.x).
       +1: jfclere, rpluem, wrowe
 
-   * core: Add extern "C" linkage to several headers to make it easier to use
-     them in C++ code.
-        PR: 42286
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=535169
-     2.2.x version of patch:
-       Trunk version works
-     +1: rpluem, wrowe, niq
-
    * mod_so: Backport 520733; more helpful LoadModule feedback, so it reads;
         Syntax error in -C/-c directive:
         API module structure 'ftp_module' in file /.../modules/mod_ftp.so 

Modified: httpd/httpd/branches/2.2.x/include/ap_listen.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_listen.h?view=diff&rev=536627&r1=536626&r2=536627
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_listen.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_listen.h Wed May  9 12:35:45 2007
@@ -30,6 +30,10 @@
 #include "httpd.h"
 #include "http_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct ap_listen_rec ap_listen_rec;
 typedef apr_status_t (*accept_function)(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans);
 
@@ -114,6 +118,10 @@
   "Send buffer size in bytes"), \
 AP_INIT_TAKE1("ReceiveBufferSize", ap_set_receive_buffer_size, NULL, \
               RSRC_CONF, "Receive buffer size in bytes")
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 /** @} */

Modified: httpd/httpd/branches/2.2.x/include/ap_mpm.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_mpm.h?view=diff&rev=536627&r1=536626&r2=536627
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_mpm.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_mpm.h Wed May  9 12:35:45 2007
@@ -28,6 +28,10 @@
 
 #include "apr_thread_proc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
     The MPM, "multi-processing model" provides an abstraction of the
     interface with the OS for distributing incoming connections to
@@ -178,6 +182,10 @@
 
 AP_DECLARE_HOOK(int,fatal_exception,(ap_exception_info_t *ei))
 #endif /*AP_ENABLE_EXCEPTION_HOOK*/
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 /** @} */

Modified: httpd/httpd/branches/2.2.x/include/ap_provider.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_provider.h?view=diff&rev=536627&r1=536626&r2=536627
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_provider.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_provider.h Wed May  9 12:35:45 2007
@@ -28,6 +28,10 @@
 
 #include "ap_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     const char *provider_name;
 } ap_list_provider_names_t;
@@ -73,6 +77,10 @@
 AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool,
                                               const char *provider_group,
                                               const char *provider_version);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 /** @} */

Modified: httpd/httpd/branches/2.2.x/include/util_cfgtree.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/util_cfgtree.h?view=diff&rev=536627&r1=536626&r2=536627
==============================================================================
--- httpd/httpd/branches/2.2.x/include/util_cfgtree.h (original)
+++ httpd/httpd/branches/2.2.x/include/util_cfgtree.h Wed May  9 12:35:45 2007
@@ -28,6 +28,10 @@
 
 #include "ap_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct ap_directive_t ap_directive_t;
 
 /**
@@ -82,6 +86,10 @@
  */
 ap_directive_t *ap_add_node(ap_directive_t **parent, ap_directive_t *current, 
                             ap_directive_t *toadd, int child);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 /** @} */

Modified: httpd/httpd/branches/2.2.x/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/util_ldap.h?view=diff&rev=536627&r1=536626&r2=536627
==============================================================================
--- httpd/httpd/branches/2.2.x/include/util_ldap.h (original)
+++ httpd/httpd/branches/2.2.x/include/util_ldap.h Wed May  9 12:35:45 2007
@@ -69,6 +69,10 @@
 #define LDAP_DECLARE_DATA             __declspec(dllimport)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * LDAP Connections
  */
@@ -323,6 +327,8 @@
  * @deffunc char *util_ald_cache_display(apr_pool_t *pool, util_ldap_state_t *st)
  */
 char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st);
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* APR_HAS_LDAP */
 #endif /* UTIL_LDAP_H */



Mime
View raw message