sas Sat Feb 24 13:08:15 2001 EDT Modified files: /php4/ext/standard basic_functions.c php_ext_syslog.h syslog.c /php4/main php_syslog.h Log: Actually compile on systems without syslog. PR: #9412 Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.307 php4/ext/standard/basic_functions.c:1.308 --- php4/ext/standard/basic_functions.c:1.307 Tue Feb 20 06:23:03 2001 +++ php4/ext/standard/basic_functions.c Sat Feb 24 13:08:15 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.307 2001/02/20 14:23:03 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.308 2001/02/24 21:08:15 sas Exp $ */ #include "php.h" #include "php_main.h" @@ -507,10 +507,12 @@ PHP_FE(ezmlm_hash, NULL) /* functions from syslog.c */ +#ifdef HAVE_SYSLOG_H PHP_FE(openlog, NULL) PHP_FE(syslog, NULL) PHP_FE(closelog, NULL) PHP_FE(define_syslog_variables, NULL) +#endif /* functions from lcg.c */ PHP_FE(lcg_value, NULL) Index: php4/ext/standard/php_ext_syslog.h diff -u php4/ext/standard/php_ext_syslog.h:1.3 php4/ext/standard/php_ext_syslog.h:1.4 --- php4/ext/standard/php_ext_syslog.h:1.3 Sun Jul 23 18:39:49 2000 +++ php4/ext/standard/php_ext_syslog.h Sat Feb 24 13:08:15 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ext_syslog.h,v 1.3 2000/07/24 01:39:49 david Exp $ */ +/* $Id: php_ext_syslog.h,v 1.4 2001/02/24 21:08:15 sas Exp $ */ #ifndef PHP_EXT_SYSLOG_H #define PHP_EXT_SYSLOG_H @@ -25,9 +25,9 @@ #include "php_syslog.h" -extern PHP_MINIT_FUNCTION(syslog); -extern PHP_RINIT_FUNCTION(syslog); -extern PHP_RSHUTDOWN_FUNCTION(syslog); +PHP_MINIT_FUNCTION(syslog); +PHP_RINIT_FUNCTION(syslog); +PHP_RSHUTDOWN_FUNCTION(syslog); PHP_FUNCTION(openlog); PHP_FUNCTION(syslog); Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.24 php4/ext/standard/syslog.c:1.25 --- php4/ext/standard/syslog.c:1.24 Sun Jan 21 09:26:43 2001 +++ php4/ext/standard/syslog.c Sat Feb 24 13:08:15 2001 @@ -16,9 +16,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.24 2001/01/21 17:26:43 rasmus Exp $ */ +/* $Id: syslog.c,v 1.25 2001/02/24 21:08:15 sas Exp $ */ #include "php.h" + +#ifdef HAVE_SYSLOG_H #include "php_ini.h" #include "zend_globals.h" @@ -261,6 +263,8 @@ RETURN_TRUE; } /* }}} */ + +#endif /* * Local variables: Index: php4/main/php_syslog.h diff -u php4/main/php_syslog.h:1.4 php4/main/php_syslog.h:1.5 --- php4/main/php_syslog.h:1.4 Fri Jun 9 10:21:40 2000 +++ php4/main/php_syslog.h Sat Feb 24 13:08:15 2001 @@ -4,7 +4,10 @@ #ifdef PHP_WIN32 #include "win32/syslog.h" #else +#include "php_config.h" +#ifdef HAVE_SYSLOG_H #include <syslog.h> +#endif #endif /* -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]