From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 1 May 2000 14:40:03 +0000 (+0000)
Subject:   Significantly shorten the Win32 build and shrink symbol tables
X-Git-Tag: APACHE_2_0_ALPHA_4~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d9adaf3a8d727a6e69c1818c00e6dd82d85dc88;p=thirdparty%2Fapache%2Fhttpd.git

  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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85117 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/os/win32/os.h b/os/win32/os.h
index 806b53b3af9..baa0ab85ac9 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -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>
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index d30fbea0d51..fef9de799b1 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -56,15 +56,14 @@
  * 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.
  */
diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c
index 0442a3f8906..02a452c69fa 100644
--- a/server/mpm/winnt/registry.c
+++ b/server/mpm/winnt/registry.c
@@ -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"