changed order of includes

windows.hpp must be included before zmq.h when _WIN32_WINNT >= 0x0600
This commit is contained in:
Michael 2016-02-12 23:34:43 +11:00
parent af3b9452a2
commit 6f4e9f13f3

View File

@ -41,10 +41,6 @@
#include <stdio.h> #include <stdio.h>
#include "platform.hpp" #include "platform.hpp"
#include "likely.hpp"
// 0MQ-specific error codes are defined in zmq.h
#include "../include/zmq.h"
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp" #include "windows.hpp"
@ -52,6 +48,11 @@
#include <netdb.h> #include <netdb.h>
#endif #endif
#include "likely.hpp"
// 0MQ-specific error codes are defined in zmq.h
#include "../include/zmq.h"
// EPROTO is not used by OpenBSD and maybe other platforms. // EPROTO is not used by OpenBSD and maybe other platforms.
#ifndef EPROTO #ifndef EPROTO
#define EPROTO 0 #define EPROTO 0