cvs commit: apache-2.0/src/os/win32 os.h registry.c util_win32.c

[wr...@locus.apache.org]

wrowe       00/05/01 07:40:05

  Modified:    src/os/win32 os.h registry.c util_win32.c
  Log:
  
    Significantly shorten the Win32 build and shrink symbol tables
    for precompiled headers and debugging by eliminating large chunks
    of the windows.h declarations, especially the graphical user
    interface declarations.
  
    Also eliminates redundant inclusion of winsock and windows headers.
    As the GUI sections can be included by adding the windows.h include
    prior to any apr headers, these includes now imply something
    completely different.
  
  
  Revision  Changes    Path
  1.24      +4 -4      apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- os.h	2000/04/28 05:59:32	1.23
  +++ os.h	2000/05/01 14:40:03	1.24
  @@ -63,12 +63,12 @@
    * default. We still want the server to run on Win95/98 so use 
    * runtime checks before calling NT specific functions to verify we are 
    * really running on an NT system.
  + *
  + * Delegate windows include to the apr.h header, if USER or GDI declarations
  + * are required (for a window rather than console application), include
  + * windows.h prior to any other Apache header files.
    */
  -#define _WIN32_WINNT 0x0400
   #include "apr_general.h"
  -#include <windows.h>
  -#include <winsock2.h>
  -#include <mswsock.h>
   #include <process.h>
   #include <malloc.h>
   #include <io.h>
  
  
  
  1.18      +1 -3      apache-2.0/src/os/win32/registry.c
  
  Index: registry.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/registry.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- registry.c	2000/04/28 19:03:15	1.17
  +++ registry.c	2000/05/01 14:40:03	1.18
  @@ -82,10 +82,8 @@
    * 
    * HKLM\Software\[Vendor]\[Software]\[Version]\ServerRoot
    */
  -#include "os.h"
  -//#include <windows.h>
  -//#include <stdio.h>
   
  +#include "os.h"
   #include "httpd.h"
   #include "http_log.h"
   
  
  
  
  1.10      +3 -4      apache-2.0/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- util_win32.c	2000/04/28 18:27:55	1.9
  +++ util_win32.c	2000/05/01 14:40:03	1.10
  @@ -56,14 +56,13 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#include <windows.h>
  +#include "httpd.h"
  +#include "http_log.h"
  +
   #include <sys/stat.h>
   #include <stdarg.h>
   #include <time.h>
   #include <stdlib.h>
  -
  -#include "httpd.h"
  -#include "http_log.h"
   
   /* Returns TRUE if the input string is a string
    * of one or more '.' characters.