Merge pull request #506 from arsenm/master

Fix using wrong name for windows.h check with cmake
This commit is contained in:
Pieter Hintjens 2013-01-27 15:18:11 -08:00
commit 470d06bb9e
2 changed files with 2 additions and 5 deletions

View File

@ -42,7 +42,7 @@ include(CheckCSourceRuns)
include(CMakeDependentOption)
check_include_files(ifaddrs.h ZMQ_HAVE_IFADDRS)
check_include_files(windows.h HAVE_WINDOWS_H)
check_include_files(windows.h ZMQ_HAVE_WINDOWS)
check_include_files(sys/uio.h ZMQ_HAVE_UIO)
check_include_files(sys/eventfd.h ZMQ_HAVE_EVENTFD)

View File

@ -82,10 +82,7 @@
#define ZMQ_HAVE_SOLARIS
#endif
#if defined(WIN32) || defined(_WIN32)
#define ZMQ_HAVE_WINDOWS
#endif
#cmakedefine ZMQ_HAVE_WINDOWS
#endif