diff options
| author | Daniel Cohen Gindi <danielgindi@gmail.com> | 2014-09-20 17:05:48 +0300 |
|---|---|---|
| committer | Daniel Cohen Gindi <danielgindi@gmail.com> | 2014-09-20 17:46:32 +0300 |
| commit | 741a18446c3f6060c6d49472c4bd3039ee4ec057 (patch) | |
| tree | 6e41d7169b4fda6478d9bcd32f2bb5ed572a8085 | |
| parent | 026c48e7fc13a4a8ada0d686cc2b111043dbc2fa (diff) | |
| download | libvncserver-741a18446c3f6060c6d49472c4bd3039ee4ec057.zip libvncserver-741a18446c3f6060c6d49472c4bd3039ee4ec057.tar.gz | |
Use correct `winsock2.h` version header instead of winsock.h.
`windows.h` is referring to `winsock.h` (unless the `WIN32_LEAN_AND_MEAN` is defined).
The structs used in this header are defined in `winsock2.h` or in `winsock.h`, but we are using Winsock2 of course!
So we have to include winsock2.h and refrain from including windows.h here
| -rw-r--r-- | compat/msvc/sys/time.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compat/msvc/sys/time.h b/compat/msvc/sys/time.h index c4964d6..0c47060 100644 --- a/compat/msvc/sys/time.h +++ b/compat/msvc/sys/time.h @@ -1,8 +1,10 @@ #pragma once //http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668 -#include < time.h > -#include <windows.h> //I've ommited this line. + +#include <time.h> +#include <winsock2.h> + #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 #else |
