From: Marcus Crestani <crestani@informatik.uni-tuebingen.de>
Date: Wed, 11 Jun 2014 18:53:22 +0000 (+0200)
Subject: Include sys/sysctl.h after i3.h to prevent redefinition warnings caused by queue... 
X-Git-Tag: 4.8~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a76a81f80b4dc95881b8d20444ecfa283d29b02c;p=i3%2Fi3

Include sys/sysctl.h after i3.h to prevent redefinition warnings caused by queue.h on OS X.
---

diff --git a/src/log.c b/src/log.c
index ec44f3ae..10149081 100644
--- a/src/log.c
+++ b/src/log.c
@@ -21,10 +21,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <pthread.h>
-#if defined(__APPLE__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
 
 #include "util.h"
 #include "log.h"
@@ -32,6 +28,10 @@
 #include "libi3.h"
 #include "shmlog.h"
 
+#if defined(__APPLE__)
+#include <sys/sysctl.h>
+#endif
+
 static bool debug_logging = false;
 static bool verbose = false;
 static FILE *errorfile;