stoddard 00/02/01 13:05:49
Modified: src/include httpd.h Log: This patch is sure to break someone! We need to define MODULE_VAR_EXPORT, API_EXPORT, API_VAR_EXPORT, et. al. in an os specific way and the definitions need to be done as soon as possible in the include file chain. I choose to use os.h as the preferred mechanism for doing this (for now anyway) since this is they way it was done for Apache 1.3. win32/os.h and unix/os.h probably have some Apache private macro definitions that are being exposed publicly because of this patch. The solution to this problem is to remove the private definitions from os.h. Revision Changes Path 1.24 +1 -2 apache-2.0/src/include/httpd.h Index: httpd.h =================================================================== RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- httpd.h 2000/02/01 00:06:14 1.23 +++ httpd.h 2000/02/01 21:05:45 1.24 @@ -72,13 +72,12 @@ /* Headers in which EVERYONE has an interest... */ - +#include "os.h" #include "apr_general.h" #include "apr_lib.h" #include "apr_time.h" #include "apr_network_io.h" #include "buff.h" -#include "ap.h" #include "ap_mmn.h" #ifdef HAVE_NETINET_IN_H
