diff options
| author | Sascha Schumann <sas@php.net> | 2000-05-07 00:10:32 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-05-07 00:10:32 +0000 |
| commit | 2df8e7341e570e7aec31495b24b4c9b8f9e2336e (patch) | |
| tree | 5bd86df3c1ca4500d452e6925f7ddcff82887989 /ext | |
| parent | ec9612aa44f10fd04e74c760e7104e9621c46a9c (diff) | |
| download | php-git-2df8e7341e570e7aec31495b24b4c9b8f9e2336e.tar.gz | |
Move <syslog.h> inclusion into php_syslog.h. This will make sure that
all source files "get it."
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 3 | ||||
| -rw-r--r-- | ext/standard/php_syslog.h | 6 | ||||
| -rw-r--r-- | ext/standard/syslog.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index d41255facb..1fa2dab0fd 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -44,9 +44,6 @@ #if HAVE_LOCALE_H #include <locale.h> #endif -#ifndef PHP_WIN32 -#include <syslog.h> /* for possible syslog macro */ -#endif #include "safe_mode.h" #ifdef PHP_WIN32 #include "win32/unistd.h" diff --git a/ext/standard/php_syslog.h b/ext/standard/php_syslog.h index a1417e2cb8..71ec3fdb7c 100644 --- a/ext/standard/php_syslog.h +++ b/ext/standard/php_syslog.h @@ -32,6 +32,12 @@ #if HAVE_SYSLOG_H +#ifdef PHP_WIN32 +#include "win32/syslog.h" +#else +#include <syslog.h> +#endif + extern PHP_MINIT_FUNCTION(syslog); extern PHP_RINIT_FUNCTION(syslog); extern PHP_RSHUTDOWN_FUNCTION(syslog); diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c index 8c2a94cc25..853be18b79 100644 --- a/ext/standard/syslog.c +++ b/ext/standard/syslog.c @@ -26,11 +26,6 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef PHP_WIN32 -#include "win32/syslog.h" -#else -#include <syslog.h> -#endif #include <string.h> #include <errno.h> |