0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00

Merge pull request #944 from twwlogin/patch-1

Include zmq.h after platform.hpp
This commit is contained in:
Pieter Hintjens 2014-03-21 12:13:14 +02:00
commit 20f22e0463

View File

@ -20,9 +20,6 @@
#ifndef __ZMQ_ERR_HPP_INCLUDED__ #ifndef __ZMQ_ERR_HPP_INCLUDED__
#define __ZMQ_ERR_HPP_INCLUDED__ #define __ZMQ_ERR_HPP_INCLUDED__
// 0MQ-specific error codes are defined in zmq.h
#include "../include/zmq.h"
#include <assert.h> #include <assert.h>
#if defined _WIN32_WCE #if defined _WIN32_WCE
#include "..\builds\msvc\errno.hpp" #include "..\builds\msvc\errno.hpp"
@ -36,6 +33,9 @@
#include "platform.hpp" #include "platform.hpp"
#include "likely.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"
#else #else