From: Ken Steele <ken@tilera.com>
Date: Mon, 18 Nov 2013 18:28:17 +0000 (-0500)
Subject: Cleanup Tile build for -Werror
X-Git-Tag: suricata-2.0beta2~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=601c7c8e3ced8bb6447da65a6062d37f42c39f54;p=thirdparty%2Fsuricata.git

Cleanup Tile build for -Werror

Just the changes needed for the Tile architecture to compile cleanly with
-Werror.
---

diff --git a/src/runmode-tile.c b/src/runmode-tile.c
index 5fadb4aaa8..9e86a72ee3 100644
--- a/src/runmode-tile.c
+++ b/src/runmode-tile.c
@@ -46,7 +46,7 @@
 
 #ifdef HAVE_MPIPE
 /* Number of configured parallel pipelines. */
-unsigned int tile_num_pipelines;
+int tile_num_pipelines;
 #endif
 
 /*
diff --git a/src/runmode-tile.h b/src/runmode-tile.h
index f75c05423a..8e0af793a9 100644
--- a/src/runmode-tile.h
+++ b/src/runmode-tile.h
@@ -32,7 +32,7 @@
 const char *RunModeTileMpipeGetDefaultMode(void);
 void RunModeTileMpipeRegister(void);
 
-extern unsigned int tile_num_pipelines;
+extern int tile_num_pipelines;
 
 int RunModeTileMpipeWorkers(DetectEngineCtx *);
 
diff --git a/src/threads-arch-tile.h b/src/threads-arch-tile.h
index 1e19220506..a0e2fc501d 100644
--- a/src/threads-arch-tile.h
+++ b/src/threads-arch-tile.h
@@ -80,8 +80,8 @@
 /* Ignore signals when using spin locks */
 #define SCCondT uint8_t
 #define SCCondInit(x,y) ({ 0; })
-#define SCCondSignal(x)
-#define SCCondDestroy(x)
+#define SCCondSignal(x) ({ 0; })
+#define SCCondDestroy(x) ({ 0; })
 
 static inline void cycle_sleep(int cycles)
 {