From dd97d136a9cd19950c8dfa7e91cf792f586bc6fb Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 19 Apr 2011 15:09:02 +0200
Subject: [PATCH] Rearrange syslog.h including so we won't fail to build on
 win32.

---
 src/suricata-common.h |  2 +-
 src/util-debug.h      | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/suricata-common.h b/src/suricata-common.h
index a002350258..bd1c4b743e 100644
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -67,7 +67,7 @@
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
-#else
+#elif OS_WIN32
 #include "win32-syslog.h"
 #endif /* HAVE_SYSLOG_H */
 
diff --git a/src/util-debug.h b/src/util-debug.h
index b3fe0021ce..e41886ecc1 100644
--- a/src/util-debug.h
+++ b/src/util-debug.h
@@ -21,22 +21,17 @@
  * \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
+#ifndef __UTIL_DEBUG_H__
+#define __UTIL_DEBUG_H__
+
 #include <stdio.h>
-#include "threads.h"
 #include <stdint.h>
+#include <pcre.h>
 
+#include "threads.h"
 #include "util-enum.h"
 #include "util-error.h"
-#include "pcre.h"
 #include "util-debug-filters.h"
-#if defined __OpenBSD__
-//#include <sys/syslog.h>
-#else
-#include "syslog.h"
-#endif
-
-#ifndef __UTIL_DEBUG_H__
-#define __UTIL_DEBUG_H__
 
 /**
  * \brief ENV vars that can be used to set the properties for the logging module