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.
This commit is contained in:
AJ Lewis 2012-10-23 16:18:36 -05:00
parent c391966fbb
commit 888c1bdb5b

View File

@ -21,9 +21,7 @@
#include <stddef.h> #include <stddef.h>
#include "platform.hpp" #include "platform.hpp"
#include "proxy.hpp" #include "proxy.hpp"
#include "socket_base.hpp"
#include "likely.hpp" #include "likely.hpp"
#include "err.hpp"
#if defined ZMQ_FORCE_SELECT #if defined ZMQ_FORCE_SELECT
#define ZMQ_POLL_BASED_ON_SELECT #define ZMQ_POLL_BASED_ON_SELECT
@ -48,6 +46,11 @@
#include <poll.h> #include <poll.h>
#endif #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 // zmq.h must be included *after* poll.h for AIX to build properly
#include "../include/zmq.h" #include "../include/zmq.h"