stoddard 99/09/13 09:47:46
Modified: src/lib/apr/include apr_win.h apr_general.h Log: Include the proper win32 header files. Fix 64 bit typedefs. Revision Changes Path 1.2 +12 -2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_win.h 1999/08/17 15:59:37 1.1 +++ apr_win.h 1999/09/13 16:47:45 1.2 @@ -57,9 +57,19 @@ #ifndef APR_WIN_H #define APR_WIN_H -/*#define WIN32_LEAN_AND_MEAN*/ -#include <winsock2.h> +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#ifndef _WIN32_WINNT +/* + * Compile the server including all the Windows NT 4.0 header files by + * default. + */ +#define _WIN32_WINNT 0x0400 +#endif #include <windows.h> +#include <winsock2.h> +#include <mswsock.h> #include <sys\types.h> #include <stddef.h> #include <stdio.h> 1.2 +2 -2 apache-2.0/src/lib/apr/include/apr_general.h Index: apr_general.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_general.h 1999/08/17 15:59:37 1.1 +++ apr_general.h 1999/09/13 16:47:45 1.2 @@ -109,8 +109,8 @@ typedef long double ap_int64_t; typedef unsigned long double ap_uint64_t; #elif (SIZEOF_LONGLONG == 8) -typedef LONGLONG ap_int64_t; -typedef ULONGLONG ap_uint64_t; +typedef __int64 ap_int64_t; +typedef unsigned __int64 ap_uint64_t; #endif typedef size_t ap_size_t;
