stoddard 99/09/13 06:32:42
Modified: src/include ap_config.h
src/os/win32 os.h
Log:
A bit of WIN32 header file cleanup
Revision Changes Path
1.270 +1 -8 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- ap_config.h 1999/09/07 19:58:20 1.269
+++ ap_config.h 1999/09/13 13:32:40 1.270
@@ -108,8 +108,6 @@
#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"
@@ -1065,13 +1063,8 @@
#ifndef O_BINARY
#define O_BINARY (0)
#endif
-
-#else /* WIN32 */
-#include <winsock2.h>
-#include <malloc.h>
-#include <io.h>
-#include <fcntl.h>
#endif /* ndef WIN32 */
+
#include <limits.h>
#include <time.h> /* for ctime */
#ifdef WIN32
1.31 +74 -3 apache-1.3/src/os/win32/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- os.h 1999/06/30 09:09:43 1.30
+++ os.h 1999/09/13 13:32:41 1.31
@@ -1,6 +1,79 @@
+/* ====================================================================
+ * 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
+ * [EMAIL PROTECTED]
+ *
+ * 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"
/*
@@ -18,9 +91,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
@@ -28,7 +100,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
