generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-27 11:06:52 +01:00
Code Issues Projects Releases Wiki Activity

minor fixes for MSVC++ 2005 build

Browse Source
This commit is contained in:
malosek
2009-11-03 14:06:25 +01:00
parent 7cbdcc9542
commit 7d672d3ab8
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app_thread.cpp
View File

@@ -25,6 +25,9 @@
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp" #include "windows.hpp"
#if defined _MSC_VER
#include <intrin.h>
#endif
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif

2
src/fd.hpp
View File

@@ -31,7 +31,7 @@ namespace zmq
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#if defined _MSC_VER &&_MSC_VER <= 1400 #if defined _MSC_VER &&_MSC_VER <= 1400
typedef UINT_PTR fd_t; typedef UINT_PTR fd_t;
enum {retired_fd = (fd_t)(~0)} enum {retired_fd = (fd_t)(~0)};
#else #else
typedef SOCKET fd_t; typedef SOCKET fd_t;
enum {retired_fd = INVALID_SOCKET}; enum {retired_fd = INVALID_SOCKET};

5
src/windows.hpp
View File

@@ -47,6 +47,11 @@
#include <windows.h> #include <windows.h>
// MSVC++ 2005 on Win2000 does not define _WIN32_WINNT.
#ifndef _WIN32_WINNT
#define _WIN32_WINNT WINVER
#endif
// Enable winsock (not included when WIN32_LEAN_AND_MEAN is defined). // Enable winsock (not included when WIN32_LEAN_AND_MEAN is defined).
#if(_WIN32_WINNT >= 0x0400) #if(_WIN32_WINNT >= 0x0400)
#include <winsock2.h> #include <winsock2.h>