Merge pull request #1580 from ricnewton/master

Fix windows cmake build
This commit is contained in:
Pieter Hintjens 2015-09-14 14:24:37 +02:00
commit 0f51190c27
2 changed files with 2 additions and 2 deletions

View File

@ -157,7 +157,7 @@ check_function_exists(gethrtime HAVE_GETHRTIME)
set(CMAKE_REQUIRED_INCLUDES ) set(CMAKE_REQUIRED_INCLUDES )
add_definitions(-D_REENTRANT -D_THREAD_SAFE) add_definitions(-D_REENTRANT -D_THREAD_SAFE)
add_definitions(-D_USING_CMAKE) add_definitions(-DZMQ_USING_CMAKE)
option(ENABLE_EVENTFD "Enable/disable eventfd" ZMQ_HAVE_EVENTFD) option(ENABLE_EVENTFD "Enable/disable eventfd" ZMQ_HAVE_EVENTFD)

View File

@ -32,7 +32,7 @@
#include "../include/zmq.h" #include "../include/zmq.h"
#include "../src/stdint.hpp" #include "../src/stdint.hpp"
#ifdef USING_CMAKE #ifdef ZMQ_USING_CMAKE
# include "platform.hpp" # include "platform.hpp"
#else #else
# include "../src/platform.hpp" # include "../src/platform.hpp"