STABLE14-emulate-vsyslog-20071214

LICENSE IPL10

Do not include vsyslog on Windows.

Include syslog.h for the syslog() prototype.

(cherry picked from commit 059031b3c6ff61340daad288deb378dc48cbd43a)

diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index 4880dcf5f857a006c3c853d6c2184206063892d0..8236e653bdc92f5947ed9472a9d39d331ab8f6fe 100644 (file)
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -14,6 +14,9 @@ RCSID
 #ifndef AFS_NT40_ENV
 #include <netinet/in.h>
 #include <netdb.h>
+#ifndef HAVE_VSYSLOG
+#include <syslog.h>
+#endif
 #else
 #include <winsock2.h>
 #endif
@@ -520,6 +523,7 @@ vsnprintf(char *p, unsigned int avail, char *fmt, va_list ap)
 }
 #endif /* AFS_OSF20_ENV || AFS_AIX32_ENV */
 
+#ifndef AFS_NT40_ENV
 #ifndef HAVE_VSYSLOG
 void
 vsyslog(int priority, const char *format, va_list args)
@@ -530,7 +534,6 @@ vsyslog(int priority, const char *format, va_list args)
 }
 #endif
 
-#ifndef AFS_NT40_ENV
 #if defined(AFS_OSF20_ENV) && !defined(AFS_DUX50_ENV) || defined(AFS_AIX32_ENV) || (defined(AFS_SUN55_ENV) && !defined(AFS_SUN56_ENV)) || !defined(HAVE_SNPRINTF)
 
 #ifdef AFS_AIX51_ENV