cvs: php4 / configure.in php_syslog.h

sas Fri Jun 9 10:21:40 2000 EDT Modified files: /php4 configure.in php_syslog.h Log: Real fix for std_syslog issue on OpenServer. This is limited to the native development system (/bin/cc and icc) and does not show up with the UDK. Index: php4/configure.in diff -u php4/configure.in:1.141 php4/configure.in:1.142 --- php4/configure.in:1.141 Wed Jun 7 23:14:58 2000 +++ php4/configure.in Fri Jun 9 10:21:40 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.141 2000/06/08 06:14:58 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.142 2000/06/09 17:21:40 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -361,6 +361,7 @@ srandom \ statfs \ statvfs \ +std_syslog \ strcasecmp \ strdup \ strerror \ Index: php4/php_syslog.h diff -u php4/php_syslog.h:1.3 php4/php_syslog.h:1.4 --- php4/php_syslog.h:1.3 Wed May 31 17:48:28 2000 +++ php4/php_syslog.h Fri Jun 9 10:21:40 2000 @@ -7,26 +7,23 @@ #include <syslog.h> #endif -/* - * SCO OpenServer 5 defines syslog to var_syslog/std_syslog which - * causes trouble with our use of syslog. We define php_syslog - * to be the system function syslog. +/* + * The SCO OpenServer 5 Development System (not the UDK) + * defines syslog to std_syslog. */ #ifdef syslog -#if defined(var_syslog) && var_syslog == syslog -#define php_syslog var_syslog -#elif defined(std_syslog) && std_syslog == syslog +#ifdef HAVE_STD_SYSLOG #define php_syslog std_syslog #endif +#undef syslog + #endif #ifndef php_syslog #define php_syslog syslog -#undef syslog #endif - #endif