Revision: 4327
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4327&view=rev
Author: ossman_
Date: 2011-03-08 13:05:27 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Windows actually has socklen_t, it's just that it is in a special header.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/common/network/TcpSocket.cxx
trunk/common/os/net.c
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-03-08 13:00:12 UTC (rev 4326)
+++ trunk/CMakeLists.txt 2011-03-08 13:05:27 UTC (rev 4327)
@@ -118,12 +118,13 @@
include(CheckFunctionExists)
include(CheckTypeSize)
if(WIN32)
- set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h)
+ set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h ws2tcpip.h)
set(CMAKE_REQUIRED_LIBRARIES ws2_32)
+else()
+ set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
endif()
check_function_exists(inet_aton HAVE_INET_ATON)
check_function_exists(inet_ntop HAVE_INET_NTOP)
-set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
check_type_size(socklen_t SOCKLEN_T)
set(CMAKE_EXTRA_INCLUDE_FILES)
Modified: trunk/common/network/TcpSocket.cxx
===================================================================
--- trunk/common/network/TcpSocket.cxx 2011-03-08 13:00:12 UTC (rev 4326)
+++ trunk/common/network/TcpSocket.cxx 2011-03-08 13:05:27 UTC (rev 4327)
@@ -23,6 +23,7 @@
#ifdef WIN32
//#include <io.h>
#include <winsock2.h>
+#include <ws2tcpip.h>
#define errorNumber WSAGetLastError()
#else
#define errorNumber errno
Modified: trunk/common/os/net.c
===================================================================
--- trunk/common/os/net.c 2011-03-08 13:00:12 UTC (rev 4326)
+++ trunk/common/os/net.c 2011-03-08 13:05:27 UTC (rev 4327)
@@ -25,6 +25,7 @@
#ifdef WIN32
#include <winsock2.h>
+#include <ws2tcpip.h>
#else
#include <sys/socket.h>
#include <netinet/in.h>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
