diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2000-05-01 14:40:03 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2000-05-01 14:40:03 +0000 |
| commit | 6d9adaf3a8d727a6e69c1818c00e6dd82d85dc88 (patch) | |
| tree | ee82e2b94c402a6c1ef258ef41535c455b5f9c86 | |
| parent | f8e8de348f871def0cfe356cc6495fdf43480d92 (diff) | |
| download | httpd-6d9adaf3a8d727a6e69c1818c00e6dd82d85dc88.tar.gz | |
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
| -rw-r--r-- | os/win32/os.h | 8 | ||||
| -rw-r--r-- | os/win32/util_win32.c | 7 | ||||
| -rw-r--r-- | server/mpm/winnt/registry.c | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/os/win32/os.h b/os/win32/os.h index 806b53b3af..baa0ab85ac 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 d30fbea0d5..fef9de799b 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 0442a3f890..02a452c69f 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" |