Merge pull request #1931 from hitstergtd/unistd-fix

Problem: unistd.h redundantly included twice
This commit is contained in:
Luca Boccassi 2016-04-27 11:15:14 +01:00
commit 6712f6dd01
2 changed files with 0 additions and 5 deletions

View File

@ -68,7 +68,6 @@
#else #else
#include <unistd.h> #include <unistd.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif

View File

@ -81,10 +81,6 @@ struct iovec {
#include "socket_poller.hpp" #include "socket_poller.hpp"
#include "timers.hpp" #include "timers.hpp"
#if !defined ZMQ_HAVE_WINDOWS
#include <unistd.h>
#endif
#if defined ZMQ_HAVE_OPENPGM #if defined ZMQ_HAVE_OPENPGM
#define __PGM_WININT_H__ #define __PGM_WININT_H__
#include <pgm/pgm.h> #include <pgm/pgm.h>