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.

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

diff --git a/include/httpd.h b/include/httpd.h
index 64e73f3d975425fb6af763ab02466ca23f01d7c8..b304a3afbdb6cfa6b2a03a71f5502872abfd7461 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -72,13 +72,12 @@ extern "C" {
 
 
 /* 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