cvs: /php4/ext/standard basic_functions.c php_syslog.h syslog.c

sas Sat May 6 17:10:32 2000 EDT Modified files: /php4/ext/standard basic_functions.c php_syslog.h syslog.c Log: Move <syslog.h> inclusion into php_syslog.h. This will make sure that all source files "get it." Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.187 php4/ext/standard/basic_functions.c:1.188 --- php4/ext/standard/basic_functions.c:1.187 Sat May 6 16:17:11 2000 +++ php4/ext/standard/basic_functions.c Sat May 6 17:10:32 2000 @@ -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" Index: php4/ext/standard/php_syslog.h diff -u php4/ext/standard/php_syslog.h:1.3 php4/ext/standard/php_syslog.h:1.4 --- php4/ext/standard/php_syslog.h:1.3 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/php_syslog.h Sat May 6 17:10:32 2000 @@ -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); Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.17 php4/ext/standard/syslog.c:1.18 --- php4/ext/standard/syslog.c:1.17 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/syslog.c Sat May 6 17:10:32 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.17 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: syslog.c,v 1.18 2000/05/07 00:10:32 sas Exp $ */ #include "php.h" #include "php_ini.h" @@ -25,11 +25,6 @@ #include <stdlib.h> #if HAVE_UNISTD_H #include <unistd.h> -#endif -#ifdef PHP_WIN32 -#include "win32/syslog.h" -#else -#include <syslog.h> #endif #include <string.h>