Skip to content

Commit 8f58728

Browse files
author
Sascha Schumann
committed
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.
1 parent b98d2a8 commit 8f58728

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ srand48 \
361361
srandom \
362362
statfs \
363363
statvfs \
364+
std_syslog \
364365
strcasecmp \
365366
strdup \
366367
strerror \

main/php_syslog.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,23 @@
77
#include <syslog.h>
88
#endif
99

10-
/*
11-
* SCO OpenServer 5 defines syslog to var_syslog/std_syslog which
12-
* causes trouble with our use of syslog. We define php_syslog
13-
* to be the system function syslog.
10+
/*
11+
* The SCO OpenServer 5 Development System (not the UDK)
12+
* defines syslog to std_syslog.
1413
*/
1514

1615
#ifdef syslog
1716

18-
#if defined(var_syslog) && var_syslog == syslog
19-
#define php_syslog var_syslog
20-
#elif defined(std_syslog) && std_syslog == syslog
17+
#ifdef HAVE_STD_SYSLOG
2118
#define php_syslog std_syslog
2219
#endif
2320

21+
#undef syslog
22+
2423
#endif
2524

2625
#ifndef php_syslog
2726
#define php_syslog syslog
28-
#undef syslog
2927
#endif
3028

31-
3229
#endif

0 commit comments

Comments
 (0)