Skip to content

L
libzmq
Commit 20f22e04 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Merge pull request #944 from twwlogin/patch-1 

Include zmq.h after platform.hpp
parents c217ab73 9051456f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/err.hpp
View file @ 20f22e04
...@@ -20,9 +20,6 @@ ...@@ -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 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment