From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 26 Apr 2012 09:18:19 +0000 (+0000)
Subject: Windows has a bit of a peculiarity in that winsock2.h must be included
X-Git-Tag: v1.2.90~179
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f4fc697847a61fac1799182e7e7a0b97fcc94e2;p=tigervnc.git

Windows has a bit of a peculiarity in that winsock2.h must be included
before windows.h for correct winsock behaviour. mingw-w64 also enforces
this order, so to avoid compile errors we must include windows.h late in
all files.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4906 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/win/winvnc/JavaViewer.cxx b/win/winvnc/JavaViewer.cxx
index 6f9f6de5..3813f22c 100644
--- a/win/winvnc/JavaViewer.cxx
+++ b/win/winvnc/JavaViewer.cxx
@@ -16,7 +16,6 @@
  * USA.
  */
 
-#include <windows.h>
 #include <winvnc/JavaViewer.h>
 #include <winvnc/resource.h>
 #include <rdr/MemInStream.h>
@@ -24,6 +23,8 @@
 #include <rfb/VNCServerST.h>
 #include <rfb_win32/TCharArray.h>
 
+#include <windows.h>
+
 #define strcasecmp _stricmp
 
 using namespace winvnc;