generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-23 15:14:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #444 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-24 06:50:02 -07:00
commit d2ee38acfe
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 "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 <poll.h>
#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"