From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 5 Sep 2020 05:20:59 +0000 (+0000)
Subject: Restore broken win32 build, include apr/std headers before httpd headers
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b34368df5e5c56759cd9a6be1d62b26360e61af;p=thirdparty%2Fapache%2Fhttpd.git

Restore broken win32 build, include apr/std headers before httpd headers

 - In httpd we override exit() to trap the true exit code (see os/win32/os.h)
 - process.h was redefining exit() which picked up the macro instead of the
   original exit() declaration
 - Cleaner style pulls in apr, then standard C headers, and finally sets down
   the httpd includes on top of these, resolving the windows build regression




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

diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index a7795c4749f..2790a47cc5b 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -15,37 +15,36 @@
  * limitations under the License.
  */
 
-#include "mod_lua.h"
+#include "apr_thread_mutex.h"
+#include "apr_pools.h"
+#include "apr_optional.h"
+
+/* getpid for *NIX vs Windows */
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if APR_HAVE_PROCESS_H
+#include <process.h>
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <apr_thread_mutex.h>
-#include <apr_pools.h>
+
+#include "mod_lua.h"
 #include "lua_apr.h"
 #include "lua_config.h"
-#include "apr_optional.h"
 #include "mod_ssl.h"
 #include "mod_auth.h"
 #include "util_mutex.h"
 
-
 #ifdef APR_HAS_THREADS
 #include "apr_thread_proc.h"
 #endif
 
-/* getpid for *NIX */
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-/* getpid for Windows */
-#if APR_HAVE_PROCESS_H
-#include <process.h>
-#endif
-
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap_lua, AP_LUA, int, lua_open,
                                     (lua_State *L, apr_pool_t *p),
                                     (L, p), OK, DECLINED)