From: Sascha Schumann <sas@php.net>
Date: Fri, 9 Jun 2000 17:21:40 +0000 (+0000)
Subject: Real fix for std_syslog issue on OpenServer. This is limited to the native
X-Git-Tag: php-4.0.1RC~322
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f58728e2b334f2d7a1bc576fc9abb502503fa69;p=php

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 641cb94cd5..4be847f5fb 100644
--- 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 c9abb8f0c6..cf70159133 100644
--- 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