3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 16:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from vortechs2000/fix_aix

Browse Source 
Fix Build Regression #449: Move socket_base.hpp and err.hpp after poll.h include
This commit is contained in:
Pieter Hintjens 2012-10-23 17:01:36 -07:00
commit ceb388e371
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/proxy.cpp
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"