From: DRC <dcommander@users.sourceforge.net>
Date: Wed, 12 Oct 2011 20:02:55 +0000 (+0000)
Subject: Re-order headers to ensure that winsock2.h is included before windows.h.  Otherwise... 
X-Git-Tag: v1.1.90~86
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4426f00f07daeae0361dcb13b21474128f98d872;p=tigervnc.git

Re-order headers to ensure that winsock2.h is included before windows.h.  Otherwise, MinGW64 complains and MSVC barfs.  This is necessary because os.h now includes windows.h via. w32tiger.h.


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

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 079e7adc..5fe7fe08 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -35,7 +35,6 @@
 #define mkdir(path, mode) _mkdir(path)
 #endif
 
-#include <os/os.h>
 #include <rfb/Logger_stdio.h>
 #include <rfb/SecurityClient.h>
 #include <rfb/Security.h>
@@ -45,6 +44,7 @@
 #include <rfb/LogWriter.h>
 #include <rfb/Timer.h>
 #include <network/TcpSocket.h>
+#include <os/os.h>
 
 #include <FL/Fl.H>
 #include <FL/Fl_Widget.H>