stoddard 00/01/23 08:37:48
Modified: src/lib/apr/include apr_win.h src/main buff.c util_script.c src/modules/standard mod_alias.c mod_setenvif.c src/os/win32 main_win32.c os.h Log: Fix compile breaks on Windows. Revision Changes Path 1.12 +1 -0 apache-2.0/src/lib/apr/include/apr_win.h Index: apr_win.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_win.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- apr_win.h 2000/01/17 19:37:53 1.11 +++ apr_win.h 2000/01/23 16:37:36 1.12 @@ -104,6 +104,7 @@ #define APR_HAS_THREADS 1 #define APR_HAS_SENDFILE 0 #define APR_HAS_MMAP 0 +#define APR_HAVE_IN_ADDR /* Typedefs that APR needs. */ 1.28 +1 -10 apache-2.0/src/main/buff.c Index: buff.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/buff.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- buff.c 2000/01/04 19:00:52 1.27 +++ buff.c 2000/01/23 16:37:39 1.28 @@ -58,21 +58,12 @@ #include "httpd.h" #include "http_main.h" #include "http_log.h" +#include "ap_config.h" #include <stdio.h> #include <stdarg.h> #include <string.h> #include <sys/types.h> - -/* This writev sillyness will go away with APR. */ -#ifndef NO_WRITEV -#include <sys/uio.h> -#else -#ifdef WIN32 -/* Include code to emulate writev on WIN32 */ -#include <../os/win32/iol_socket.h> -#endif -#endif #ifdef HAVE_BSTRING_H #include <bstring.h> /* for IRIX, FD_SET calls bzero() */ 1.24 +1 -0 apache-2.0/src/main/util_script.c Index: util_script.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- util_script.c 2000/01/19 01:15:14 1.23 +++ util_script.c 2000/01/23 16:37:40 1.24 @@ -65,6 +65,7 @@ #include "http_request.h" /* for sub_req_lookup_uri() */ #include "util_script.h" #include "util_date.h" /* For parseHTTPdate() */ +#include "ap_config.h" #include <stdlib.h> #include <string.h> 1.4 +1 -0 apache-2.0/src/modules/standard/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_alias.c 1999/08/31 05:33:42 1.3 +++ mod_alias.c 2000/01/23 16:37:43 1.4 @@ -66,6 +66,7 @@ #include "httpd.h" #include "http_config.h" #include "http_request.h" +#include "ap_config.h" typedef struct { char *real; 1.5 +1 -0 apache-2.0/src/modules/standard/mod_setenvif.c Index: mod_setenvif.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_setenvif.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_setenvif.c 1999/08/31 05:34:01 1.4 +++ mod_setenvif.c 2000/01/23 16:37:43 1.5 @@ -119,6 +119,7 @@ #include "http_core.h" #include "http_log.h" #include "http_protocol.h" +#include "ap_config.h" enum special { SPECIAL_NOT, 1.5 +2 -1 apache-2.0/src/os/win32/main_win32.c Index: main_win32.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- main_win32.c 1999/12/20 19:07:31 1.4 +++ main_win32.c 2000/01/23 16:37:46 1.5 @@ -64,7 +64,7 @@ * link an executable without at least one object file. This * satistifies that requirement. */ - +#define CORE_PRIVATE #include "httpd.h" #include "http_main.h" #include "http_config.h" @@ -72,6 +72,7 @@ #include "service.h" #include "http_log.h" #include "registry.h" +#include "ap_config.h" __declspec(dllexport) int apache_main(int argc, char *argv[]); #define DEFAULTSERVICENAME "Apache" 1.14 +1 -1 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- os.h 2000/01/19 01:16:31 1.13 +++ os.h 2000/01/23 16:37:46 1.14 @@ -64,7 +64,7 @@ * really running on an NT system. */ #define _WIN32_WINNT 0x0400 - +#include "apr_general.h" #include <windows.h> #include <winsock2.h> #include <mswsock.h>