httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr_file_io.h apr_network_io.h apr_thread_proc.h
Date Mon, 19 Jun 2000 00:45:41 GMT
trawick     00/06/18 17:45:40

  Modified:    src      CHANGES
               src/include ap_config.h
               src/lib/apr/include apr_file_io.h apr_network_io.h
                        apr_thread_proc.h
  Log:
  Repair C++ compatibility in ap_config.h, apr_file_io.h,
  apr_network_io.h, and apr_thread_proc.h.
  Submitted by:	Tyler J. Brooks <tylerjbrooks@home.com>
  
  Revision  Changes    Path
  1.158     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- CHANGES	2000/06/17 11:55:18	1.157
  +++ CHANGES	2000/06/19 00:45:38	1.158
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0a5
   
  +  *) Repair C++ compatibility in ap_config.h, apr_file_io.h, 
  +     apr_network_io.h, and apr_thread_proc.h.  
  +     [Tyler J. Brooks <tylerjbrooks@home.com>, Jeff Trawick]
  +
     *) Bring the allocation and pool debugging code back into a working
        state.  This will need to be tested as so far it's only been used on
        BeOS. [David Reid]
  
  
  
  1.37      +0 -5      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ap_config.h	2000/06/12 23:34:23	1.36
  +++ ap_config.h	2000/06/19 00:45:39	1.37
  @@ -87,10 +87,6 @@
   #define MODULE_VAR_EXPORT       __declspec(dllexport)
   #endif
   
  -#ifdef __cplusplus
  -extern "C" {
  -#endif
  -
   #ifdef WIN32
   #include "os.h"
   #else
  @@ -106,7 +102,6 @@
   
   /* ap_ versions of ctype macros to make sure they deal with 8-bit chars */
   #include "ap_ctype.h"
  -
   
   /* XXX - This probably doesn't handle OS/2 */
   #ifdef SELECT_NEEDS_CAST
  
  
  
  1.56      +8 -8      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- apr_file_io.h	2000/06/17 17:04:17	1.55
  +++ apr_file_io.h	2000/06/19 00:45:40	1.56
  @@ -127,7 +127,7 @@
   /*   Function definitions */
   /*
   
  -=head1 ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t
perm, ap_pool_t *cont)
  +=head1 ap_status_t ap_open(ap_file_t **new_file, const char *fname, ap_int32_t flag, ap_fileperms_t
perm, ap_pool_t *cont)
   
   B<Open the specified file.>
   
  @@ -153,7 +153,7 @@
   
   =cut
    */
  -ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, 
  +ap_status_t ap_open(ap_file_t **new_file, const char *fname, ap_int32_t flag, 
                       ap_fileperms_t perm, ap_pool_t *cont);
   
   /*
  @@ -461,7 +461,7 @@
   
   /*
   
  -=head1 ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont)
  +=head1 ap_status_t ap_opendir(ap_dir_t **new_dir, const char *dirname, ap_pool_t *cont)
   
   B<Open the specified directory.>
   
  @@ -471,7 +471,7 @@
   
   =cut
    */                        
  -ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont);
  +ap_status_t ap_opendir(ap_dir_t **new_dir, const char *dirname, ap_pool_t *cont);
   
   /*
   
  @@ -598,7 +598,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_filename(char **new, ap_file_t *thefile)
  +=head1 ap_status_t ap_get_filename(char **new_path, ap_file_t *thefile)
   
   B<return the file name of the current file.>
   
  @@ -607,11 +607,11 @@
   
   =cut
    */                     
  -ap_status_t ap_get_filename(char **new, ap_file_t *thefile);
  +ap_status_t ap_get_filename(char **new_path, ap_file_t *thefile);
   
   /*
   
  -=head1 ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir) 
  +=head1 ap_status_t ap_get_dir_filename(char **new_path, ap_dir_t *thedir) 
   
   B<Get the file name of the current directory entry.>
   
  @@ -620,7 +620,7 @@
   
   =cut
    */                        
  -ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir);
  +ap_status_t ap_get_dir_filename(char **new_path, ap_dir_t *thedir);
   
   /*
   
  
  
  
  1.39      +6 -6      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apr_network_io.h	2000/06/14 20:55:58	1.38
  +++ apr_network_io.h	2000/06/19 00:45:40	1.39
  @@ -139,7 +139,7 @@
   
   /*
   
  -=head1 ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
  +=head1 ap_status_t ap_create_tcp_socket(ap_socket_t **new_sock, ap_pool_t *cont)
   
   B<Create a socket for tcp communication.>
   
  @@ -148,7 +148,7 @@
   
   =cut
    */
  -ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont);
  +ap_status_t ap_create_tcp_socket(ap_socket_t **new_sock, ap_pool_t *cont);
   
   /*
   
  @@ -213,7 +213,7 @@
   
   /*
   
  -=head1 ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_pool)
  +=head1 ap_status_t ap_accept(ap_socket_t **new_sock, ap_socket_t *sock, ap_pool_t *connection_pool)
   
   B<Accept a new connection request>
   
  @@ -225,7 +225,7 @@
   
   =cut
    */
  -ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, 
  +ap_status_t ap_accept(ap_socket_t **new_sock, const ap_socket_t *sock, 
                         ap_pool_t *connection_pool);
   
   /*
  @@ -591,7 +591,7 @@
   
   /*
   
  -=head1 ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
  +=head1 ap_status_t ap_setup_poll(ap_pollfd_t **new_poll, ap_int32_t num, ap_pool_t *cont)
   
   B<Setup the memory required for poll to operate properly.>
   
  @@ -601,7 +601,7 @@
   
   =cut
    */
  -ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, 
  +ap_status_t ap_setup_poll(ap_pollfd_t **new_poll, ap_int32_t num, 
                             ap_pool_t *cont);
   
   /*
  
  
  
  1.37      +13 -13    apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- apr_thread_proc.h	2000/06/10 12:02:31	1.36
  +++ apr_thread_proc.h	2000/06/19 00:45:40	1.37
  @@ -117,7 +117,7 @@
   
   /*
   
  -=head1 ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
  +=head1 ap_status_t ap_create_threadattr(ap_threadattr_t **new_attr, ap_pool_t *cont)
   
   B<Create and initialize a new threadattr variable>
   
  @@ -126,7 +126,7 @@
   
   =cut
    */
  -ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont);
  +ap_status_t ap_create_threadattr(ap_threadattr_t **new_attr, ap_pool_t *cont);
   
   /*
   
  @@ -151,11 +151,11 @@
   
   =cut
    */
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *iattr);
  +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr);
   
   /*
   
  -=head1 ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, ap_thread_start_t
func, void *data, ap_pool_t *cont)
  +=head1 ap_status_t ap_create_thread(ap_thread_t **new_thread, ap_threadattr_t *attr, ap_thread_start_t
func, void *data, ap_pool_t *cont)
   
   B<Create a new thread of execution> 
   
  @@ -167,7 +167,7 @@
   
   =cut
    */
  -ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, 
  +ap_status_t ap_create_thread(ap_thread_t **new_thread, ap_threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
                                ap_pool_t *cont);
   
  @@ -257,7 +257,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
  +=head1 ap_status_t ap_get_thread_private(void **new_mem, ap_threadkey_t *key)
   
   B<Get a pointer to the thread private memory>
   
  @@ -266,7 +266,7 @@
   
   =cut
    */
  -ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key);
  +ap_status_t ap_get_thread_private(void **new_mem, ap_threadkey_t *key);
   
   /*
   
  @@ -327,7 +327,7 @@
   /* Process Function definitions */
   /*
   
  -=head1 ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
  +=head1 ap_status_t ap_createprocattr_init(ap_procattr_t **new_attr, ap_pool_t *cont)
   
   B<Create and initialize a new procattr variable> 
   
  @@ -336,7 +336,7 @@
   
   =cut
    */
  -ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont);
  +ap_status_t ap_createprocattr_init(ap_procattr_t **new_attr, ap_pool_t *cont);
   
   /*
   
  @@ -498,7 +498,7 @@
   
   /*
   
  -=head1 ap_status_t ap_create_process(ap_proc_t *new, const char *progname, char *const
args[], char **env, ap_procattr_t *attr, ap_pool_t *cont) 
  +=head1 ap_status_t ap_create_process(ap_proc_t *new_proc, const char *progname, char *const
args[], char **env, ap_procattr_t *attr, ap_pool_t *cont) 
   
   B<Create a new process and execute a new program within that process.>
   
  @@ -514,7 +514,7 @@
   
   =cut
    */
  -ap_status_t ap_create_process(ap_proc_t *new, const char *progname, 
  +ap_status_t ap_create_process(ap_proc_t *new_proc, const char *progname, 
                                 char *const args[], char **env, 
                                 ap_procattr_t *attr, ap_pool_t *cont);
   
  @@ -565,7 +565,7 @@
   
   /*
   
  -=head1 ap_status_t ap_detach(ap_proc_t *new, ap_pool_t *cont)
  +=head1 ap_status_t ap_detach(ap_proc_t *new_proc, ap_pool_t *cont)
   
   B<Detach the process from the controlling terminal.>
   
  @@ -574,7 +574,7 @@
   
   =cut
    */
  -ap_status_t ap_detach(ap_proc_t *new, ap_pool_t *cont);
  +ap_status_t ap_detach(ap_proc_t *new_proc, ap_pool_t *cont);
   
   #if APR_HAS_OTHER_CHILD
   /*
  
  
  

Mime
View raw message