httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/include http_main.h
Date Thu, 02 Nov 2000 04:44:44 GMT
wrowe       00/11/01 20:44:44

  Modified:    src/main http_main.c
               src/include http_main.h
  Log:
    Get win32 building again... we need something just a little more sophisticated here
  
  Submitted by:	John Sterling <sterling@covalent.net
  Reviewed by:	rbb, wrowe
  
  Revision  Changes    Path
  1.68      +2 -0      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- http_main.c	2000/10/30 23:08:27	1.67
  +++ http_main.c	2000/11/02 04:44:43	1.68
  @@ -294,11 +294,13 @@
   
       apr_initialize();
   
  +#ifndef WIN32 /* A -feature- (?) macro is needed here */
       /* This ugly little hack pulls any function referenced in exports.c into
        * the web server.  exports.c is generated by buildconf, and it
        * has all of the apr functions specified by httpd.exp.
        */
       ap_ugly_hack = apr_initialize;
  +#endif
   
       process = create_process(argc, argv);
       pglobal = process->pool;
  
  
  
  1.15      +2 -0      apache-2.0/src/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_main.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- http_main.h	2000/10/30 23:08:26	1.14
  +++ http_main.h	2000/11/02 04:44:43	1.15
  @@ -89,7 +89,9 @@
    *  effect the server based on command line options */
   extern AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
   
  +#ifndef WIN32 /* A -feature- (?) macro is needed here */
   extern void *ap_ugly_hack;
  +#endif
   
   #ifdef __cplusplus
   }
  
  
  

Mime
View raw message