diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2018-01-04 08:14:41 +0100 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2018-01-04 08:14:41 +0100 |
| commit | 1d0ac9819a32152e1bf547032ca50e4053e5a227 (patch) | |
| tree | 2e84ca7fe6325b742e2f2128622b97cff53e852a /sapi/apache2handler | |
| parent | 44c5dea9d6a0ede12f9ec8c3f851a8b96acbe9e7 (diff) | |
| download | php-git-1d0ac9819a32152e1bf547032ca50e4053e5a227.tar.gz | |
Use PHP_WIN32
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 572aa98b2f..eebc88567e 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -42,7 +42,7 @@ #include "util_script.h" #include "http_core.h" #include "ap_mpm.h" -#if !defined(WIN32) && !defined(WINNT) +#ifndef PHP_WIN32 #include "unixd.h" #endif @@ -371,12 +371,12 @@ PHP_MINFO_FUNCTION(apache) int n, max_requests; char *p; server_rec *serv = ((php_struct *) SG(server_context))->r->server; -#if !defined(WIN32) && !defined(WINNT) -#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201 +#ifndef PHP_WIN32 +# if MODULE_MAGIC_NUMBER_MAJOR >= 20081201 AP_DECLARE_DATA extern unixd_config_rec ap_unixd_config; -#else +# else AP_DECLARE_DATA extern unixd_config_rec unixd_config; -#endif +# endif #endif for (n = 0; ap_loaded_modules[n]; ++n) { @@ -410,7 +410,7 @@ PHP_MINFO_FUNCTION(apache) snprintf(tmp, sizeof(tmp), "%s:%u", serv->server_hostname, serv->port); php_info_print_table_row(2, "Hostname:Port", tmp); -#if !defined(WIN32) && !defined(WINNT) +#ifndef PHP_WIN32 #if MODULE_MAGIC_NUMBER_MAJOR >= 20081201 snprintf(tmp, sizeof(tmp), "%s(%d)/%d", ap_unixd_config.user_name, ap_unixd_config.user_id, ap_unixd_config.group_id); #else |