diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-10-12 20:02:55 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-10-12 20:02:55 +0000 |
| commit | 4426f00f07daeae0361dcb13b21474128f98d872 (patch) | |
| tree | e0c03c19fd8c2ebd097397a618d55bf6ae5219c3 /vncviewer | |
| parent | 3080ec406527bc274969f2b7a25fcefc4520ece5 (diff) | |
| download | tigervnc-4426f00f07daeae0361dcb13b21474128f98d872.tar.gz tigervnc-4426f00f07daeae0361dcb13b21474128f98d872.zip | |
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
Diffstat (limited to 'vncviewer')
| -rw-r--r-- | vncviewer/vncviewer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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> |