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

Makefile.am

@@ -234,7 +234,8 @@ src_libzmq_la_SOURCES = \
 	src/decoder_allocators.cpp \
 	src/decoder_allocators.hpp \
 	src/socket_poller.cpp \
-	src/socket_poller.hpp
+	src/socket_poller.hpp \
+	src/zmq_draft.hpp
 
 if USE_TWEETNACL
 src_libzmq_la_SOURCES += \

builds/msvc/vs2013/libzmq/libzmq.vcxproj

@@ -67,6 +67,7 @@
     <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
     <ClInclude Include="..\..\platform.hpp" />
     <ClInclude Include="..\..\resource.h" />
     <ClInclude Include="..\..\..\..\include\zmq.h" />

builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters

@@ -567,6 +567,9 @@
     <ClInclude Include="..\..\..\..\src\tweetnacl.h">
       <Filter>src\include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="include">

src/address.cpp

@@ -29,7 +29,6 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
 #include "address.hpp"
 #include "ctx.hpp"
 #include "err.hpp"

src/atomic_counter.hpp

@@ -31,7 +31,6 @@
 #define __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
 
 #include "stdint.hpp"
-#include "platform.hpp"
 
 #if defined ZMQ_FORCE_MUTEXES
 #define ZMQ_ATOMIC_COUNTER_MUTEX

src/atomic_ptr.hpp

@@ -30,8 +30,6 @@
 #ifndef __ZMQ_ATOMIC_PTR_HPP_INCLUDED__
 #define __ZMQ_ATOMIC_PTR_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if defined ZMQ_FORCE_MUTEXES
 #define ZMQ_ATOMIC_PTR_MUTEX
 #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS

src/clock.cpp

@@ -29,7 +29,6 @@
 
 #include "precompiled.hpp"
 #include "clock.hpp"
-#include "platform.hpp"
 #include "likely.hpp"
 #include "config.hpp"
 #include "err.hpp"

src/condition_variable.hpp

@@ -30,7 +30,6 @@
 #ifndef __ZMQ_CONDITON_VARIABLE_HPP_INCLUDED__
 #define __ZMQ_CONDITON_VARIABLE_HPP_INCLUDED__
 
-#include "platform.hpp"
 #include "clock.hpp"
 #include "err.hpp"
 #include "mutex.hpp"

src/ctx.cpp

@@ -29,10 +29,7 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#ifndef ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #endif
 

src/curve_client.cpp

@@ -29,14 +29,9 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
 
 #ifdef ZMQ_HAVE_CURVE
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "msg.hpp"
 #include "session_base.hpp"
 #include "err.hpp"

src/curve_client.hpp

@@ -32,8 +32,6 @@
 
 #ifdef ZMQ_HAVE_CURVE
 
-#include "platform.hpp"
-
 #if defined (ZMQ_USE_TWEETNACL)
 #   include "tweetnacl.h"
 #elif defined (ZMQ_USE_LIBSODIUM)

src/curve_server.cpp

@@ -29,14 +29,9 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
 
 #ifdef ZMQ_HAVE_CURVE
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "msg.hpp"
 #include "session_base.hpp"
 #include "err.hpp"

src/curve_server.hpp

@@ -32,8 +32,6 @@
 
 #ifdef ZMQ_HAVE_CURVE
 
-#include "platform.hpp"
-
 #if defined (ZMQ_USE_TWEETNACL)
 #   include "tweetnacl.h"
 #elif defined (ZMQ_USE_LIBSODIUM)

src/dish.cpp

@@ -30,13 +30,6 @@
 #include "precompiled.hpp"
 #include <string.h>
 
-#include "platform.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
-#include "../include/zmq.h"
 #include "macros.hpp"
 #include "dish.hpp"
 #include "err.hpp"

src/err.hpp

@@ -40,18 +40,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "platform.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#ifndef ZMQ_HAVE_WINDOWS
 #include <netdb.h>
 #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.
 #ifndef EPROTO

src/fd.hpp

@@ -30,12 +30,6 @@
 #ifndef __ZMQ_FD_HPP_INCLUDED__
 #define __ZMQ_FD_HPP_INCLUDED__
 
-#include "platform.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 namespace zmq
 {
 #ifdef ZMQ_HAVE_WINDOWS

src/gssapi_client.cpp

@@ -28,14 +28,9 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
 
 #ifdef HAVE_LIBGSSAPI_KRB5
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include <string.h>
 #include <string>
 

src/gssapi_mechanism_base.cpp

@@ -28,14 +28,9 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
 
 #ifdef HAVE_LIBGSSAPI_KRB5
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include <string.h>
 #include <string>
 

src/gssapi_mechanism_base.hpp

@@ -30,8 +30,6 @@
 #ifndef __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
 #define __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #ifdef HAVE_LIBGSSAPI_KRB5
 
 #if HAVE_GSSAPI_GSSAPI_GENERIC_H

src/gssapi_server.cpp

@@ -28,14 +28,9 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
 
 #ifdef HAVE_LIBGSSAPI_KRB5
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include <string.h>
 #include <string>
 

src/io_thread.cpp

@@ -28,11 +28,11 @@
 */
 
 #include "precompiled.hpp"
+
 #include <new>
 
 #include "macros.hpp"
 #include "io_thread.hpp"
-#include "platform.hpp"
 #include "err.hpp"
 #include "ctx.hpp"
 

src/ip.cpp

@@ -30,11 +30,8 @@
 #include "precompiled.hpp"
 #include "ip.hpp"
 #include "err.hpp"
-#include "platform.hpp"
 
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>

src/ipc_address.hpp

@@ -32,8 +32,6 @@
 
 #include <string>
 
-#include "platform.hpp"
-
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
 
 #include <sys/socket.h>

src/ipc_connecter.cpp

@@ -37,7 +37,6 @@
 
 #include "stream_engine.hpp"
 #include "io_thread.hpp"
-#include "platform.hpp"
 #include "random.hpp"
 #include "err.hpp"
 #include "ip.hpp"

src/ipc_connecter.hpp

@@ -30,8 +30,6 @@
 #ifndef __IPC_CONNECTER_HPP_INCLUDED__
 #define __IPC_CONNECTER_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
 
 #include "fd.hpp"

src/ipc_listener.hpp

@@ -30,8 +30,6 @@
 #ifndef __ZMQ_IPC_LISTENER_HPP_INCLUDED__
 #define __ZMQ_IPC_LISTENER_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
 
 #include <string>

src/mailbox.hpp

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 
-#include "platform.hpp"
 #include "signaler.hpp"
 #include "fd.hpp"
 #include "config.hpp"

src/mailbox_safe.hpp

@@ -33,7 +33,6 @@
 #include <vector>
 #include <stddef.h>
 
-#include "platform.hpp"
 #include "signaler.hpp"
 #include "fd.hpp"
 #include "config.hpp"

src/msg.cpp

@@ -30,7 +30,6 @@
 #include "precompiled.hpp"
 #include "macros.hpp"
 #include "msg.hpp"
-#include "../include/zmq.h"
 
 #include <string.h>
 #include <stdlib.h>

src/mtrie.cpp

@@ -33,14 +33,9 @@
 #include <new>
 #include <algorithm>
 
-#include "macros.hpp"
-#include "platform.hpp"
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "err.hpp"
 #include "pipe.hpp"
+#include "macros.hpp"
 #include "mtrie.hpp"
 
 zmq::mtrie_t::mtrie_t () :

src/mutex.hpp

@@ -30,7 +30,6 @@
 #ifndef __ZMQ_MUTEX_HPP_INCLUDED__
 #define __ZMQ_MUTEX_HPP_INCLUDED__
 
-#include "platform.hpp"
 #include "err.hpp"
 
 //  Mutex class encapsulates OS mutex in a platform-independent way.

src/null_mechanism.cpp

@@ -28,10 +28,6 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
 
 #include <stddef.h>
 #include <string.h>

src/options.hpp

@@ -37,7 +37,6 @@
 #include "stddef.h"
 #include "stdint.hpp"
 #include "tcp_address.hpp"
-#include "../include/zmq.h"
 
 #if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
 #include <sys/types.h>

src/pgm_receiver.cpp

@@ -29,16 +29,11 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
 
 #if defined ZMQ_HAVE_OPENPGM
 
 #include <new>
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "pgm_receiver.hpp"
 #include "session_base.hpp"
 #include "v1_decoder.hpp"

src/pgm_receiver.hpp

@@ -30,14 +30,8 @@
 #ifndef __ZMQ_PGM_RECEIVER_HPP_INCLUDED__
 #define __ZMQ_PGM_RECEIVER_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if defined ZMQ_HAVE_OPENPGM
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include <map>
 #include <algorithm>
 

src/pgm_sender.cpp

@@ -28,14 +28,9 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
 
 #if defined ZMQ_HAVE_OPENPGM
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include <stdlib.h>
 
 #include "io_thread.hpp"

src/pgm_sender.hpp

@@ -30,14 +30,8 @@
 #ifndef __ZMQ_PGM_SENDER_HPP_INCLUDED__
 #define __ZMQ_PGM_SENDER_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if defined ZMQ_HAVE_OPENPGM
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "stdint.hpp"
 #include "io_object.hpp"
 #include "i_engine.hpp"

src/pgm_socket.cpp

@@ -28,14 +28,9 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
 
 #ifdef ZMQ_HAVE_OPENPGM
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #ifdef ZMQ_HAVE_LINUX
 #include <poll.h>
 #endif

src/pgm_socket.hpp

@@ -30,12 +30,9 @@
 #ifndef __PGM_SOCKET_HPP_INCLUDED__
 #define __PGM_SOCKET_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if defined ZMQ_HAVE_OPENPGM
 
 #ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
 #define __PGM_WININT_H__
 #endif
 

src/plain_client.cpp

@@ -29,10 +29,6 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
 
 #include <string>
 

src/plain_server.cpp

@@ -28,10 +28,6 @@
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
 
 #include <string>
 

src/poller.hpp

@@ -30,8 +30,6 @@
 #ifndef __ZMQ_POLLER_HPP_INCLUDED__
 #define __ZMQ_POLLER_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if   defined ZMQ_USE_KQUEUE  + defined ZMQ_USE_EPOLL \
     + defined ZMQ_USE_DEVPOLL + defined ZMQ_USE_POLL  \
     + defined ZMQ_USE_SELECT > 1

src/precompiled.hpp

@@ -30,9 +30,21 @@
 #ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__
 #define __ZMQ_PRECOMPILED_HPP_INCLUDED__
 
-#ifdef _MSC_VER
+#include "platform.hpp"
 
+// This must be included before any windows headers are compiled.
+#if defined ZMQ_HAVE_WINDOWS
 #include "windows.hpp"
+#endif
+
+// 0MQ definitions and exported functions
+#include "../include/zmq.h"
+
+// 0MQ DRAFT definitions and exported functions
+#include "zmq_draft.h"
+
+// TODO: expand pch implementation to non-windows builds.
+#ifdef _MSC_VER
 
 // standard C headers
 #include <assert.h>
@@ -104,88 +116,4 @@
 
 #endif // _MSC_VER
 
-
-// 0MQ definitions and exported functions
-#include "platform.hpp"
-#include "../include/zmq.h"
-
-/******************************************************************************/
-/*  These functions are DRAFT and disabled in stable releases, and subject to */
-/*  change at ANY time until declared stable.                                 */
-/******************************************************************************/
-
-#ifndef ZMQ_BUILD_DRAFT_API
-
-/*  DRAFT Socket types.                                                       */
-#define ZMQ_SERVER 12
-#define ZMQ_CLIENT 13
-#define ZMQ_RADIO 14
-#define ZMQ_DISH 15
-#define ZMQ_GATHER 16
-#define ZMQ_SCATTER 17
-
-/*  DRAFT Socket methods.                                                     */
-int zmq_join (void *s, const char *group);
-int zmq_leave (void *s, const char *group);
-
-/*  DRAFT Msg methods.                                                        */
-int zmq_msg_set_routing_id(zmq_msg_t *msg, uint32_t routing_id);
-uint32_t zmq_msg_routing_id(zmq_msg_t *msg);
-int zmq_msg_set_group(zmq_msg_t *msg, const char *group);
-const char *zmq_msg_group(zmq_msg_t *msg);
-
-/******************************************************************************/
-/*  Poller polling on sockets,fd and thread-safe sockets                      */
-/******************************************************************************/
-
-#define ZMQ_HAVE_POLLER
-
-typedef struct zmq_poller_event_t
-{
-    void *socket;
-#if defined _WIN32
-    SOCKET fd;
-#else
-    int fd;
-#endif
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-void *zmq_poller_new (void);
-int  zmq_poller_destroy (void **poller_p);
-int  zmq_poller_add (void *poller, void *socket, void *user_data, short events);
-int  zmq_poller_modify (void *poller, void *socket, short events);
-int  zmq_poller_remove (void *poller, void *socket);
-int  zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
-
-#if defined _WIN32
-int zmq_poller_add_fd (void *poller, SOCKET fd, void *user_data, short events);
-int zmq_poller_modify_fd (void *poller, SOCKET fd, short events);
-int zmq_poller_remove_fd (void *poller, SOCKET fd);
-#else
-int zmq_poller_add_fd (void *poller, int fd, void *user_data, short events);
-int zmq_poller_modify_fd (void *poller, int fd, short events);
-int zmq_poller_remove_fd (void *poller, int fd);
-#endif
-
-/******************************************************************************/
-/*  Scheduling timers                                                         */
-/******************************************************************************/
-
-#define ZMQ_HAVE_TIMERS
-
-typedef void (zmq_timer_fn)(int timer_id, void *arg);
-
-void *zmq_timers_new (void);
-int   zmq_timers_destroy (void **timers_p);
-int   zmq_timers_add (void *timers, size_t interval, zmq_timer_fn handler, void *arg);
-int   zmq_timers_cancel (void *timers, int timer_id);
-int   zmq_timers_set_interval (void *timers, int timer_id, size_t interval);
-int   zmq_timers_reset (void *timers, int timer_id);
-long  zmq_timers_timeout (void *timers);
-int   zmq_timers_execute (void *timers);
-
-#endif // ZMQ_BUILD_DRAFT_API
-
 #endif //ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__

src/proxy.cpp

@@ -46,8 +46,9 @@
 #include "socket_base.hpp"
 #include "err.hpp"
 
+// TODO: determine if this is an issue, since zmq.h is being loaded from pch.
 // zmq.h must be included *after* poll.h for AIX to build properly
-#include "../include/zmq.h"
+//#include "../include/zmq.h"
 
 int capture(
         class zmq::socket_base_t *capture_,

src/random.cpp

@@ -30,10 +30,7 @@
 #include "precompiled.hpp"
 #include <stdlib.h>
 
-#include "platform.hpp"
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #endif
 

src/raw_decoder.cpp

@@ -31,11 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "platform.hpp"
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "raw_decoder.hpp"
 #include "err.hpp"
 

src/raw_encoder.hpp

@@ -30,12 +30,6 @@
 #ifndef __ZMQ_RAW_ENCODER_HPP_INCLUDED__
 #define __ZMQ_RAW_ENCODER_HPP_INCLUDED__
 
-#if defined(_MSC_VER)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>

src/select.cpp

@@ -31,10 +31,7 @@
 #include "select.hpp"
 #if defined ZMQ_USE_SELECT
 
-#include "platform.hpp"
-
 #if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
 #elif defined ZMQ_HAVE_HPUX
 #include <sys/param.h>
 #include <sys/types.h>

src/select.hpp

@@ -34,14 +34,11 @@
 #include "poller.hpp"
 #if defined ZMQ_USE_SELECT
 
-#include "platform.hpp"
-
 #include <stddef.h>
 #include <vector>
 #include <map>
 
 #if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
 #elif defined ZMQ_HAVE_OPENVMS
 #include <sys/types.h>
 #include <sys/time.h>

src/signaler.cpp

@@ -38,7 +38,6 @@
 #include <poll.h>
 #elif defined ZMQ_POLL_BASED_ON_SELECT
 #if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
 #elif defined ZMQ_HAVE_HPUX
 #include <sys/param.h>
 #include <sys/types.h>
@@ -63,9 +62,7 @@
 #include <sys/eventfd.h>
 #endif
 
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #include <netinet/tcp.h>
 #include <sys/types.h>

src/socket_base.cpp

@@ -33,10 +33,8 @@
 #include <algorithm>
 
 #include "macros.hpp"
-#include "platform.hpp"
 
 #if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
 #if defined _MSC_VER
 #if defined _WIN32_WCE
 #include <cmnintrin.h>
@@ -60,7 +58,6 @@
 #include "pipe.hpp"
 #include "err.hpp"
 #include "ctx.hpp"
-#include "platform.hpp"
 #include "likely.hpp"
 #include "msg.hpp"
 #include "address.hpp"

src/socks.cpp

@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 #include "err.hpp"
-#include "platform.hpp"
 #include "socks.hpp"
 #include "tcp.hpp"
 

src/socks_connecter.cpp

@@ -34,7 +34,6 @@
 #include "macros.hpp"
 #include "socks_connecter.hpp"
 #include "stream_engine.hpp"
-#include "platform.hpp"
 #include "random.hpp"
 #include "err.hpp"
 #include "ip.hpp"
@@ -44,9 +43,7 @@
 #include "session_base.hpp"
 #include "socks.hpp"
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#ifndef ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>

src/socks_connecter.hpp

@@ -34,7 +34,6 @@
 #include "io_object.hpp"
 #include "own.hpp"
 #include "stdint.hpp"
-#include "../include/zmq.h"
 #include "socks.hpp"
 
 namespace zmq

src/stdint.hpp

@@ -30,8 +30,6 @@
 #ifndef __ZMQ_STDINT_HPP_INCLUDED__
 #define __ZMQ_STDINT_HPP_INCLUDED__
 
-#include "platform.hpp"
-
 #if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
 
 #include <inttypes.h>

src/stream_engine.cpp

@@ -29,7 +29,6 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
 
 #include <string.h>
 #include <new>

src/stream_engine.hpp

@@ -39,7 +39,6 @@
 #include "i_decoder.hpp"
 #include "options.hpp"
 #include "socket_base.hpp"
-#include "../include/zmq.h"
 #include "metadata.hpp"
 
 namespace zmq

src/tcp.cpp

@@ -32,11 +32,8 @@
 #include "ip.hpp"
 #include "tcp.hpp"
 #include "err.hpp"
-#include "platform.hpp"
 
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>

src/tcp_address.hpp

@@ -30,11 +30,7 @@
 #ifndef __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
 #define __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
 
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif

src/tcp_connecter.cpp

@@ -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>

src/tcp_connecter.hpp

@@ -34,7 +34,6 @@
 #include "own.hpp"
 #include "stdint.hpp"
 #include "io_object.hpp"
-#include "../include/zmq.h"
 
 namespace zmq
 {

src/tcp_listener.cpp

@@ -33,7 +33,6 @@
 #include <string>
 #include <stdio.h>
 
-#include "platform.hpp"
 #include "tcp_listener.hpp"
 #include "stream_engine.hpp"
 #include "io_thread.hpp"
@@ -44,9 +43,7 @@
 #include "tcp.hpp"
 #include "socket_base.hpp"
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#ifndef ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>

src/tcp_listener.hpp

@@ -35,7 +35,6 @@
 #include "stdint.hpp"
 #include "io_object.hpp"
 #include "tcp_address.hpp"
-#include "../include/zmq.h"
 
 namespace zmq
 {

src/thread.cpp

@@ -31,7 +31,6 @@
 #include "macros.hpp"
 #include "thread.hpp"
 #include "err.hpp"
-#include "platform.hpp"
 
 #ifdef ZMQ_HAVE_WINDOWS
 

src/thread.hpp

@@ -30,11 +30,7 @@
 #ifndef __ZMQ_THREAD_HPP_INCLUDED__
 #define __ZMQ_THREAD_HPP_INCLUDED__
 
-#include "platform.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#ifndef ZMQ_HAVE_WINDOWS
 #include <pthread.h>
 #endif
 

src/trie.cpp

@@ -28,20 +28,15 @@
 */
 
 #include "precompiled.hpp"
+#include "macros.hpp"
+#include "err.hpp"
+#include "trie.hpp"
+
 #include <stdlib.h>
 
 #include <new>
 #include <algorithm>
 
-#include "macros.hpp"
-#include "platform.hpp"
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
-#include "err.hpp"
-#include "trie.hpp"
-
 zmq::trie_t::trie_t () :
     refcnt (0),
     min (0),

src/tweetnacl.c

@@ -27,7 +27,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+/*
+    The precompiled header is not used for c files so this is required here.
+*/
 #include "platform.hpp"
+
 #if defined (ZMQ_USE_TWEETNACL)
 
 /*

src/tweetnacl.h

@@ -30,8 +30,6 @@
 #ifndef TWEETNACL_H
 #define TWEETNACL_H
 
-#include "platform.hpp"
-
 #if defined (ZMQ_USE_TWEETNACL)
 
 #define crypto_box_SECRETKEYBYTES 32

src/udp_address.cpp

@@ -33,14 +33,11 @@
 
 #include "macros.hpp"
 #include "udp_address.hpp"
-#include "platform.hpp"
 #include "stdint.hpp"
 #include "err.hpp"
 #include "ip.hpp"
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#ifndef ZMQ_HAVE_WINDOWS
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <netdb.h>

src/udp_address.hpp

@@ -30,11 +30,7 @@
 #ifndef __ZMQ_UDP_ADDRESS_HPP_INCLUDED__
 #define __ZMQ_UDP_ADDRESS_HPP_INCLUDED__
 
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif

src/udp_engine.cpp

@@ -28,11 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "precompiled.hpp"
-#include "platform.hpp"
 
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/socket.h>

src/v1_decoder.cpp

@@ -32,11 +32,6 @@
 #include <string.h>
 #include <limits>
 
-#include "platform.hpp"
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "decoder.hpp"
 #include "v1_decoder.hpp"
 #include "likely.hpp"

src/v2_decoder.cpp

@@ -32,19 +32,12 @@
 #include <string.h>
 #include <cmath>
 
-#include "platform.hpp"
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include "v2_protocol.hpp"
 #include "v2_decoder.hpp"
 #include "likely.hpp"
 #include "wire.hpp"
 #include "err.hpp"
 
-
-
 zmq::v2_decoder_t::v2_decoder_t (size_t bufsize_, int64_t maxmsgsize_) :
     shared_message_memory_allocator( bufsize_),
     decoder_base_t <v2_decoder_t, shared_message_memory_allocator> (this),

src/ypipe.hpp

@@ -32,7 +32,6 @@
 
 #include "atomic_ptr.hpp"
 #include "yqueue.hpp"
-#include "platform.hpp"
 #include "ypipe_base.hpp"
 
 namespace zmq

src/zmq.cpp

@@ -40,16 +40,14 @@
 #include <poll.h>
 #endif
 
+// TODO: determine if this is an issue, since zmq.h is being loaded from pch.
 // zmq.h must be included *after* poll.h for AIX to build properly
-#include "../include/zmq.h"
+//#include "../include/zmq.h"
 
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #endif
 
-
 // XSI vector I/O
 #if defined ZMQ_HAVE_UIO
 #include <sys/uio.h>
@@ -60,7 +58,6 @@ struct iovec {
 };
 #endif
 
-
 #include <string.h>
 #include <stdlib.h>
 #include <new>

src/zmq_draft.h

+/*
+    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
+
+    This file is part of libzmq, the ZeroMQ core engine in C++.
+
+    libzmq is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License (LGPL) as published
+    by the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    As a special exception, the Contributors give you permission to link
+    this library with independent modules to produce an executable,
+    regardless of the license terms of these independent modules, and to
+    copy and distribute the resulting executable under terms of your choice,
+    provided that you also meet, for each linked independent module, the
+    terms and conditions of the license of that module. An independent
+    module is a module which is not derived from or based on this library.
+    If you modify this library, you must extend this exception to your
+    version of the library.
+
+    libzmq is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ZMQ_DRAFT_H_INCLUDED__
+#define __ZMQ_DRAFT_H_INCLUDED__
+
+/******************************************************************************/
+/*  These functions are DRAFT and disabled in stable releases, and subject to */
+/*  change at ANY time until declared stable.                                 */
+/******************************************************************************/
+
+#ifndef ZMQ_BUILD_DRAFT_API
+
+/*  DRAFT Socket types.                                                       */
+#define ZMQ_SERVER 12
+#define ZMQ_CLIENT 13
+#define ZMQ_RADIO 14
+#define ZMQ_DISH 15
+#define ZMQ_GATHER 16
+#define ZMQ_SCATTER 17
+
+/*  DRAFT Socket methods.                                                     */
+int zmq_join (void *s, const char *group);
+int zmq_leave (void *s, const char *group);
+
+/*  DRAFT Msg methods.                                                        */
+int zmq_msg_set_routing_id(zmq_msg_t *msg, uint32_t routing_id);
+uint32_t zmq_msg_routing_id(zmq_msg_t *msg);
+int zmq_msg_set_group(zmq_msg_t *msg, const char *group);
+const char *zmq_msg_group(zmq_msg_t *msg);
+
+/******************************************************************************/
+/*  Poller polling on sockets,fd and thread-safe sockets                      */
+/******************************************************************************/
+
+#define ZMQ_HAVE_POLLER
+
+typedef struct zmq_poller_event_t
+{
+    void *socket;
+#if defined _WIN32
+    SOCKET fd;
+#else
+    int fd;
+#endif
+    void *user_data;
+    short events;
+} zmq_poller_event_t;
+
+void *zmq_poller_new (void);
+int  zmq_poller_destroy (void **poller_p);
+int  zmq_poller_add (void *poller, void *socket, void *user_data, short events);
+int  zmq_poller_modify (void *poller, void *socket, short events);
+int  zmq_poller_remove (void *poller, void *socket);
+int  zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
+
+#if defined _WIN32
+int zmq_poller_add_fd (void *poller, SOCKET fd, void *user_data, short events);
+int zmq_poller_modify_fd (void *poller, SOCKET fd, short events);
+int zmq_poller_remove_fd (void *poller, SOCKET fd);
+#else
+int zmq_poller_add_fd (void *poller, int fd, void *user_data, short events);
+int zmq_poller_modify_fd (void *poller, int fd, short events);
+int zmq_poller_remove_fd (void *poller, int fd);
+#endif
+
+/******************************************************************************/
+/*  Scheduling timers                                                         */
+/******************************************************************************/
+
+#define ZMQ_HAVE_TIMERS
+
+typedef void (zmq_timer_fn)(int timer_id, void *arg);
+
+void *zmq_timers_new (void);
+int   zmq_timers_destroy (void **timers_p);
+int   zmq_timers_add (void *timers, size_t interval, zmq_timer_fn handler, void *arg);
+int   zmq_timers_cancel (void *timers, int timer_id);
+int   zmq_timers_set_interval (void *timers, int timer_id, size_t interval);
+int   zmq_timers_reset (void *timers, int timer_id);
+long  zmq_timers_timeout (void *timers);
+int   zmq_timers_execute (void *timers);
+
+#endif // ZMQ_BUILD_DRAFT_API
+
+#endif //ifndef __ZMQ_DRAFT_H_INCLUDED__

src/zmq_utils.cpp

@@ -29,7 +29,6 @@
 
 #include "precompiled.hpp"
 #include "macros.hpp"
-#include "platform.hpp"
 
 #include "clock.hpp"
 #include "err.hpp"
@@ -39,15 +38,13 @@
 #include <assert.h>
 
 #if !defined ZMQ_HAVE_WINDOWS
-#   include <unistd.h>
-#else
-#   include "windows.hpp"
+#include <unistd.h>
 #endif
 
 #if defined (ZMQ_USE_TWEETNACL)
-#   include "tweetnacl.h"
+#include "tweetnacl.h"
 #elif defined (ZMQ_USE_LIBSODIUM)
-#   include "sodium.h"
+#include "sodium.h"
 #endif
 
 void zmq_sleep (int seconds_)