Problem: name conflicts from windows.h, draft API declared in pch.

This commit is contained in:
evoskuil
2016-05-13 20:41:26 -07:00
parent bda9374864
commit 2b798e486a
77 changed files with 163 additions and 326 deletions

View File

@@ -35,7 +35,6 @@
#include "tcp_connecter.hpp"
#include "stream_engine.hpp"
#include "io_thread.hpp"
#include "platform.hpp"
#include "random.hpp"
#include "err.hpp"
#include "ip.hpp"
@@ -44,9 +43,7 @@
#include "tcp_address.hpp"
#include "session_base.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#else
#if !defined ZMQ_HAVE_WINDOWS
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>