From 4b34368df5e5c56759cd9a6be1d62b26360e61af Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 5 Sep 2020 05:20:59 +0000 Subject: [PATCH] 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 --- modules/lua/mod_lua.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index a7795c4749..2790a47cc5 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -15,35 +15,34 @@ * limitations under the License. */ -#include "mod_lua.h" -#include -#include -#include -#include -#include -#include "lua_apr.h" -#include "lua_config.h" +#include "apr_thread_mutex.h" +#include "apr_pools.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 */ +/* getpid for *NIX vs Windows */ #if APR_HAVE_SYS_TYPES_H #include #endif +#if APR_HAVE_PROCESS_H +#include +#endif #if APR_HAVE_UNISTD_H #include #endif -/* getpid for Windows */ -#if APR_HAVE_PROCESS_H -#include +#include +#include +#include + +#include "mod_lua.h" +#include "lua_apr.h" +#include "lua_config.h" +#include "mod_ssl.h" +#include "mod_auth.h" +#include "util_mutex.h" + +#ifdef APR_HAS_THREADS +#include "apr_thread_proc.h" #endif APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap_lua, AP_LUA, int, lua_open,