From 229aa9e64424cf05fc2391ad2e7e2baefc37542f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 26 Jul 2007 07:50:55 +0000
Subject: applied patch from Michel Samia to fix compilation when NOT compiled
 for     pthreads

---
 ChangeLog   | 7 ++++++-
 tcpsyslog.c | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1394c054..946761ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 ---------------------------------------------------------------------------
 Version 1.17.4 (rgerhards), 2007-07-2?
+- continued to work on modularization
+- fixed a situation where rsyslogd could create zombie processes
+  thanks to mildew for the patch
+- applied patch from Michel Samia to fix compilation when NOT
+  compiled for pthreads
 ---------------------------------------------------------------------------
 Version 1.17.3 (rgerhards), 2007-07-25
 - continued working on modularization
@@ -14,7 +19,7 @@ Version 1.17.3 (rgerhards), 2007-07-25
   at all. If it cant, it complains and terminates
   thanks to Michel Samia for providing the patch!
 - fixed a small memory leak when HUPing syslogd. The allowed sender
-  list now gets freed. thanks mildew to for the patch.
+  list now gets freed. thanks to mildew for the patch.
 - changed the way error messages in early startup are logged. They
   now do no longer use the syslogd code directly but are rather
   send to stderr.
diff --git a/tcpsyslog.c b/tcpsyslog.c
index e8a52c97..1c7d2301 100644
--- a/tcpsyslog.c
+++ b/tcpsyslog.c
@@ -38,6 +38,9 @@
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 #ifdef USE_PTHREADS
 #include <pthread.h>
 #endif
-- 
cgit v1.2.3