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.

diff --git a/configure.in b/configure.in
index 641cb94cd5be1fe51944dd228a1573a39c8ce75d..4be847f5fb05436a11443e698d0f96f1c5b5bbdb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -361,6 +361,7 @@ srand48 \
 srandom \
 statfs \
 statvfs \
+std_syslog \
 strcasecmp \
 strdup \
 strerror \

diff --git a/main/php_syslog.h b/main/php_syslog.h
index c9abb8f0c6d101ba8ecbc40640c38b9c71d90a5b..cf701591338f2c113361a89eb447c740670dd2ac 100644 (file)
--- a/main/php_syslog.h
+++ b/main/php_syslog.h
@@ -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