From 888c1bdb5b1f87184bee882d42a42a75f140a410 Mon Sep 17 00:00:00 2001 From: AJ Lewis Date: Tue, 23 Oct 2012 16:18:36 -0500 Subject: [PATCH] Move socket_base.hpp and err.hpp after poll.h include These two headers also include zmq.h somewhere in their dependency chain, so must be included after poll.h is included for builds to work on AIX. --- src/proxy.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/proxy.cpp b/src/proxy.cpp index f64073ec..beeac2e2 100644 --- a/src/proxy.cpp +++ b/src/proxy.cpp @@ -21,9 +21,7 @@ #include #include "platform.hpp" #include "proxy.hpp" -#include "socket_base.hpp" #include "likely.hpp" -#include "err.hpp" #if defined ZMQ_FORCE_SELECT #define ZMQ_POLL_BASED_ON_SELECT @@ -48,6 +46,11 @@ #include #endif +// These headers end up pulling in zmq.h somewhere in their include +// dependency chain +#include "socket_base.hpp" +#include "err.hpp" + // zmq.h must be included *after* poll.h for AIX to build properly #include "../include/zmq.h"