fix include orders because python defines _GNU_SOURCE unconditionally and it...

fix include orders because python defines _GNU_SOURCE unconditionally and it can collide with other libs

fix include orders because python defines _GNU_SOURCE unconditionally and it...
fix include orders because python defines _GNU_SOURCE unconditionally and it can collide with other libs
6aa4dabf · Vincent Castellano · 0cf690a8 · 6aa4dabf · 6aa4dabf
Commit 6aa4dabf authored May 23, 2015 by Vincent Castellano
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

loop.c loop.c +7 -3

main.c main.c +4 -3

No files found.
--- a/loop.c
+++ b/loop.c
@@ -21,7 +21,13 @@
 #include "config.h"
 #endif

+#if USE_PYTHON
+#include "python-tg.h"
+#endif
+
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #define READLINE_CALLBACKS

 #include <assert.h>
@@ -59,9 +65,7 @@
 #if USE_LUA
 #include "lua-tg.h"
 #endif
-#if USE_PYTHON
-#include "python-tg.h"
-#endif
+
 #include <tgl/tgl.h>
 #include <tgl/tgl-binlog.h>
 #include <tgl/tgl-net.h>

--- a/main.c
+++ b/main.c
@@ -21,6 +21,10 @@
 #include "config.h"
 #endif

+#ifdef USE_PYTHON
+#  include "python-tg.h"
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -75,9 +79,6 @@
 #  include "lua-tg.h"
 #endif

-#ifdef USE_PYTHON
-#  include "python-tg.h"
-#endif

 #include <tgl/tgl.h>