Commit 10345ee7 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536627 13f79535-47bb-0310-9956-ffa450edef68
parent f23ccdcd

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -105,15 +105,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
      (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

include/ap_listen.h

+8 −0
Original line number Diff line number Diff line
@@ -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);
@@ -115,5 +119,9 @@ AP_INIT_TAKE1("SendBufferSize", ap_set_send_buffer_size, NULL, RSRC_CONF, \ 
AP_INIT_TAKE1("ReceiveBufferSize", ap_set_receive_buffer_size, NULL, \

              RSRC_CONF, "Receive buffer size in bytes")



#ifdef __cplusplus

}

#endif



#endif

/** @} */

include/ap_mpm.h

+8 −0
Original line number Diff line number Diff line
@@ -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
@@ -179,5 +183,9 @@ typedef struct ap_exception_info_t { 
AP_DECLARE_HOOK(int,fatal_exception,(ap_exception_info_t *ei))

#endif /*AP_ENABLE_EXCEPTION_HOOK*/



#ifdef __cplusplus

}

#endif



#endif

/** @} */

include/ap_provider.h

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 


#include "ap_config.h"



#ifdef __cplusplus

extern "C" {

#endif



typedef struct {

    const char *provider_name;

} ap_list_provider_names_t;
@@ -74,5 +78,9 @@ 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

/** @} */

include/util_cfgtree.h

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 


#include "ap_config.h"



#ifdef __cplusplus

extern "C" {

#endif



typedef struct ap_directive_t ap_directive_t;



/**
@@ -83,5 +87,9 @@ AP_DECLARE_DATA extern ap_directive_t *ap_conftree; 
ap_directive_t *ap_add_node(ap_directive_t **parent, ap_directive_t *current, 

                            ap_directive_t *toadd, int child);



#ifdef __cplusplus

}

#endif



#endif

/** @} */