1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

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
This commit is contained in:
William A. Rowe Jr
2020-09-05 05:20:59 +00:00
parent 066f641991
commit 4b34368df5

View File

@@ -15,35 +15,34 @@
* limitations under the License. * limitations under the License.
*/ */
#include "mod_lua.h" #include "apr_thread_mutex.h"
#include <string.h> #include "apr_pools.h"
#include <stdlib.h>
#include <ctype.h>
#include <apr_thread_mutex.h>
#include <apr_pools.h>
#include "lua_apr.h"
#include "lua_config.h"
#include "apr_optional.h" #include "apr_optional.h"
#include "mod_ssl.h"
#include "mod_auth.h"
#include "util_mutex.h"
/* getpid for *NIX vs Windows */
#ifdef APR_HAS_THREADS
#include "apr_thread_proc.h"
#endif
/* getpid for *NIX */
#if APR_HAVE_SYS_TYPES_H #if APR_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#if APR_HAVE_PROCESS_H
#include <process.h>
#endif
#if APR_HAVE_UNISTD_H #if APR_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
/* getpid for Windows */ #include <string.h>
#if APR_HAVE_PROCESS_H #include <stdlib.h>
#include <process.h> #include <ctype.h>
#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 #endif
APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap_lua, AP_LUA, int, lua_open, APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap_lua, AP_LUA, int, lua_open,