diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2020-09-05 07:20:59 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2020-09-05 07:20:59 +0200 |
| commit | 4b34368df5e5c56759cd9a6be1d62b26360e61af (patch) | |
| tree | 75b3f31b0c374b41c6ee56d9d1dc4cd22303ffe2 /modules/lua | |
| parent | * modules/generators/cgi_common.h (cgi_handle_response): Avoid trying (diff) | |
| download | apache2-4b34368df5e5c56759cd9a6be1d62b26360e61af.tar.xz apache2-4b34368df5e5c56759cd9a6be1d62b26360e61af.zip | |
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
Diffstat (limited to 'modules/lua')
| -rw-r--r-- | modules/lua/mod_lua.c | 35 |
1 files changed, 17 insertions, 18 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,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) |