Fixup Linux compilation after applying win32 patches.

config.h.in

@@ -160,6 +160,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -172,19 +175,19 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define for Solaris 2.5.1 so the uint32_t typedef from
 <sys/synch.h>,
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used.
 If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
-   #define below would cause a
 syntax error. */
+   #define below would cause a syntax error. */
 #undef _UINT32_T
 
-/* Define for Solaris 2.5.1 so the uint64_t typedef from
 <sys/synch.h>,
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used.
 If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
-   #define below would cause a
 syntax error. */
+   #define below would cause a syntax error. */
 #undef _UINT64_T
 
-/* Define for Solaris 2.5.1 so the uint8_t typedef from
 <sys/synch.h>,
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used.
 If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
-   #define below would cause a
 syntax error. */
+   #define below would cause a syntax error. */
 #undef _UINT8_T
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
@@ -193,7 +196,7 @@
 #undef inline
 #endif
 
-/* Define to the type of a signed integer type of width exactly 32 bits
 if
+/* Define to the type of a signed integer type of width exactly 32 bits if
    such a type exists and the standard includes do not define it. */
 #undef int32_t
 
@@ -209,18 +212,18 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Define to the type of an unsigned integer type of width exactly 16 bits
 if
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
    such a type exists and the standard includes do not define it. */
 #undef uint16_t
 
-/* Define to the type of an unsigned integer type of width exactly 32 bits
 if
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
    such a type exists and the standard includes do not define it. */
 #undef uint32_t
 
-/* Define to the type of an unsigned integer type of width exactly 64 bits
 if
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
    such a type exists and the standard includes do not define it. */
 #undef uint64_t
 
-/* Define to the type of an unsigned integer type of width exactly 8 bits
 if
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
    such a type exists and the standard includes do not define it. */
 #undef uint8_t

src/source-nfq.c

@@ -65,6 +65,7 @@ TmEcode NoNFQSupportExit(ThreadVars *tv, void *initdata, void **data)
 }
 
 #else /* implied we do have NFQ support */
+#include <pthread.h>
 
 extern int max_pending_packets;
 

src/suricata-common.h

@@ -7,21 +7,12 @@
 #ifndef __SURICATA_COMMON_H__
 #define __SURICATA_COMMON_H__
 
-//#define __SC_CUDA_SUPPORT__
-
 #define TRUE   1
 #define FALSE  0
 
-#include <sys/types.h> /* for gettid(2) */
 #define _GNU_SOURCE
 #define __USE_GNU
 
-#if HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
-#endif
-
-#include <sched.h>     /* for sched_setaffinity(2) */
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -32,8 +23,18 @@
 #include <ctype.h>
 #include <string.h>
 
+#if HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif
+
+#if HAVE_SYSCALL_H
+#include <syscall.h>
+#endif
+
+#include <sys/types.h> /* for gettid(2) */
+#include <sched.h>     /* for sched_setaffinity(2) */
+
 #include <pcre.h>
-#include "threads.h"
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
@@ -59,6 +60,10 @@
 #include <sys/signal.h>
 #endif
 
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
 #include <sys/types.h>
 
 #if HAVE_SYS_SOCKET_H
@@ -94,6 +99,8 @@
 #include <ws2tcpip.h>
 #endif
 
+#include "threads.h"
+
 #include <assert.h>
 #define BUG_ON(x) assert(!(x))
 

src/threads.h

@@ -9,21 +9,32 @@
 #define __THREADS_H__
 
 #ifdef OS_FREEBSD
+
 #include <sys/thr.h>
 #define PRIO_LOW 20
 #define PRIO_MEDIUM 31
 #define PRIO_HIGH 40
-#else
+
-#ifdef OS_DARWIN
+#elif OS_DARWIN
+
 #include <mach/mach_init.h>
 #define PRIO_LOW 20
 #define PRIO_MEDIUM 31
 #define PRIO_HIGH 40
+
+#elif OS_WIN32
+
+/* nothing (yet?) */
+
 #else /* LINUX */
+
+#if HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif
 #define PRIO_LOW 40
 #define PRIO_MEDIUM  50
 #define PRIO_HIGH 60
-#endif /* DARWIN */
+
 #endif /* OS_FREEBSD */
 
 #include <pthread.h>

src/util-debug.c

@@ -2,21 +2,13 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include <stdio.h>
+#include "suricata-common.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <sys/time.h>
 #include "threads.h"
 #include "util-debug.h"
 #include "util-error.h"
 #include "util-enum.h"
 #include "util-debug-filters.h"
 
-#include "suricata-common.h"
-
 #include "decode.h"
 #include "detect.h"
 #include "packet-queue.h"
@@ -628,8 +620,9 @@ static inline void SCLogFreeLogOPIfaceCtx(SCLogOPIfaceCtx *iface_ctx)
         if (iface_ctx->log_format != NULL)
             free((void *)iface_ctx->log_format);
 
-        if (iface_ctx->iface == SC_LOG_OP_IFACE_SYSLOG)
+        if (iface_ctx->iface == SC_LOG_OP_IFACE_SYSLOG) {
             closelog();
+        }
 
         iface_ctx = iface_ctx->next;