A bit of WIN32 header file cleanup

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

diff --git a/include/ap_config.h b/include/ap_config.h
index 20bd133ca7e57a3385becac4231101c97eef2d23..116156cb24f4fe1c5f567be5ffe3a82cf7aa2b63 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -112,8 +112,6 @@ stat() properly */
 #endif
 
 #ifdef WIN32
-/* include process.h first so we can override spawn[lv]e* properly */
-#include <process.h>
 #include "../os/win32/os.h"
 #else
 #include "os.h"
@@ -1071,13 +1069,6 @@ typedef int rlim_t;
 #ifndef O_BINARY
 #define O_BINARY (0)
 #endif
-
-#else /* WIN32 */
-#include <winsock2.h>
-#include <mswsock.h> /* AcceptEx, et. al. TODO: move into OS specific file (os.h? apr?) */
-#include <malloc.h>
-#include <io.h>
-#include <fcntl.h>
 #endif /* ndef WIN32 */
 #include <limits.h>
 #include <time.h>              /* for ctime */

diff --git a/os/win32/os.h b/os/win32/os.h
index d1f3f53b8a5a479e9d85c11111e55ad3de1afa69..657d109f2a571b31c92abcdfea082dfb2fc4cac9 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -1,5 +1,77 @@
+/* ====================================================================
+ * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Apache Group
+ *    for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Apache Group
+ *    for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
 #ifndef APACHE_OS_H
 #define APACHE_OS_H
+/* 
+ * Compile the server including all the Windows NT 4.0 header files by 
+ * 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.
+ */
+#define _WIN32_WINNT 0x0400
+
+#include <windows.h>
+#include <winsock2.h>
+#include <mswsock.h>
+#include <process.h>
+#include <malloc.h>
+#include <io.h>
+#include <fcntl.h>
 
 #define PLATFORM "Win32"
 
@@ -21,9 +93,8 @@
 #include <direct.h>
 
 #define STATUS
-/*#define WIN32_LEAN_AND_MEAN Now defined in project files */
 #ifndef STRICT
- #define STRICT
+#define STRICT
 #endif
 #define CASE_BLIND_FILESYSTEM
 #define NO_WRITEV
@@ -31,7 +102,6 @@
 #define NO_USE_SIGACTION
 #define NO_TIMES
 #define NO_GETTIMEOFDAY
-//#define NEED_PROCESS_H    although we do, this is specially handled in ap_config.h
 #define USE_LONGJMP
 #define HAVE_MMAP
 #define USE_MMAP_SCOREBOARD