diff options
| author | Pierre Ossman <ossman@cendio.se> | 2012-04-26 09:18:19 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2012-04-26 09:18:19 +0000 |
| commit | 7f4fc697847a61fac1799182e7e7a0b97fcc94e2 (patch) | |
| tree | 0065dd7bc374e75548abeeac946a58835dacd269 /win | |
| parent | ad8609a2ed4e37dfc1a03f529a45bfe685041da5 (diff) | |
| download | tigervnc-7f4fc697847a61fac1799182e7e7a0b97fcc94e2.tar.gz tigervnc-7f4fc697847a61fac1799182e7e7a0b97fcc94e2.zip | |
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
Diffstat (limited to 'win')
| -rw-r--r-- | win/winvnc/JavaViewer.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; |