Merge pull request #675 from vortechs2000/fix_aix

Reference platform.h by ../src/platform.h - AIX is ignoring -I flags

Merge pull request #675 from vortechs2000/fix_aix
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
1293f1b9 · Pieter Hintjens · 1a9ea3e2 · 015d9564 · 1293f1b9 · 1293f1b9
Commit 1293f1b9 authored Sep 20, 2013 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

inproc_lat.cpp perf/inproc_lat.cpp +2 -1

inproc_thr.cpp perf/inproc_thr.cpp +2 -1

testutil.hpp tests/testutil.hpp +2 -1

No files found.
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
@@ -24,7 +24,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include "platform.hpp"
+/* Just specifying platform.hpp and relying on -I flags doesn't work on AIX */
+#include "../src/platform.hpp"

 #if defined ZMQ_HAVE_WINDOWS
 #include <windows.h>

--- a/perf/inproc_thr.cpp
+++ b/perf/inproc_thr.cpp
@@ -26,7 +26,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include "platform.hpp"
+/* Just specifying platform.hpp and relying on -I flags doesn't work on AIX */
+#include "../src/platform.hpp"

 #if defined ZMQ_HAVE_WINDOWS
 #include <windows.h>

--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -22,7 +22,8 @@

 #include "../include/zmq.h"
 #include "../include/zmq_utils.h"
-#include "platform.hpp"
+/* Just specifying platform.hpp and relying on -I flags doesn't work on AIX */
+#include "../src/platform.hpp"

 #undef NDEBUG
 #include <time.h>