From 2df8e7341e570e7aec31495b24b4c9b8f9e2336e Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Sun, 7 May 2000 00:10:32 +0000
Subject: [PATCH] Move <syslog.h> inclusion into php_syslog.h. This will make
 sure that all source files "get it."

---
 ext/standard/basic_functions.c | 3 ---
 ext/standard/php_syslog.h      | 6 ++++++
 ext/standard/syslog.c          | 5 -----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index d41255facb4..1fa2dab0fdd 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -44,9 +44,6 @@
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
-#ifndef PHP_WIN32
-#include <syslog.h>		/* for possible syslog macro */
-#endif
 #include "safe_mode.h"
 #ifdef PHP_WIN32
 #include "win32/unistd.h"
diff --git a/ext/standard/php_syslog.h b/ext/standard/php_syslog.h
index a1417e2cb8f..71ec3fdb7cf 100644
--- a/ext/standard/php_syslog.h
+++ b/ext/standard/php_syslog.h
@@ -32,6 +32,12 @@
 
 #if HAVE_SYSLOG_H
 
+#ifdef PHP_WIN32
+#include "win32/syslog.h"
+#else
+#include <syslog.h>
+#endif
+
 extern PHP_MINIT_FUNCTION(syslog);
 extern PHP_RINIT_FUNCTION(syslog);
 extern PHP_RSHUTDOWN_FUNCTION(syslog);
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 8c2a94cc255..853be18b792 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -26,11 +26,6 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef PHP_WIN32
-#include "win32/syslog.h"
-#else
-#include <syslog.h>
-#endif
 
 #include <string.h>
 #include <errno.h>