summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2010-05-20 07:41:58 +0000
committerDRC <dcommander@users.sourceforge.net>2010-05-20 07:41:58 +0000
commit0a6080189652dd060b7660fc59630ef155e7cd4b (patch)
tree6b63e2fd42f8b127a42c903a702e9e27d01b9316 /win
parente2c321d3afc8a073c5e23c8655f9caaa52f74433 (diff)
downloadtigervnc-0a6080189652dd060b7660fc59630ef155e7cd4b.tar.gz
tigervnc-0a6080189652dd060b7660fc59630ef155e7cd4b.zip
Not necessary to include windows.h if winsock2.h is already included. If both are included, then winsock2.h must be included first.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4059 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
-rw-r--r--win/vncviewer/CConn.cxx1
-rw-r--r--win/vncviewer/ListenServer.h1
-rw-r--r--win/vncviewer/vncviewer.cxx2
3 files changed, 1 insertions, 3 deletions
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 2e0c3a41..511c4123 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -16,7 +16,6 @@
* USA.
*/
-#include <windows.h>
#include <winsock2.h>
#include <vncviewer/UserPasswdDialog.h>
#include <vncviewer/CConn.h>
diff --git a/win/vncviewer/ListenServer.h b/win/vncviewer/ListenServer.h
index a7676a21..d94b58b9 100644
--- a/win/vncviewer/ListenServer.h
+++ b/win/vncviewer/ListenServer.h
@@ -21,7 +21,6 @@
#ifndef __RFB_WIN32_LISTEN_SERVER_H__
#define __RFB_WIN32_LISTEN_SERVER_H__
-#include <windows.h>
#include <winsock2.h>
#include <network/Socket.h>
#include <rfb_win32/MsgWindow.h>
diff --git a/win/vncviewer/vncviewer.cxx b/win/vncviewer/vncviewer.cxx
index 4e2c7b23..8a741f7b 100644
--- a/win/vncviewer/vncviewer.cxx
+++ b/win/vncviewer/vncviewer.cxx
@@ -24,11 +24,11 @@
#endif
#include <list>
+#include <vncviewer/ListenServer.h>
#include <vncviewer/resource.h>
#include <vncviewer/CConn.h>
#include <vncviewer/CConnThread.h>
#include <vncviewer/OptionsDialog.h>
-#include <vncviewer/ListenServer.h>
#include <vncviewer/ListenTrayIcon.h>
#include <network/TcpSocket.h>
#include <rfb/Logger_stdio.h>