changing to \n line endings
authorVolker Birk <vb@pep.foundation>
Tue, 16 Jan 2018 09:08:31 +0100
changeset 23910b178873dcc0
parent 2390 8c00cb3e29ff
child 2392 c97a7f143f6d
changing to \n line endings
src/platform_windows.h
     1.1 --- a/src/platform_windows.h	Tue Jan 16 08:48:01 2018 +0100
     1.2 +++ b/src/platform_windows.h	Tue Jan 16 09:08:31 2018 +0100
     1.3 @@ -7,13 +7,13 @@
     1.4  
     1.5  #pragma warning(disable : 4996)
     1.6  
     1.7 -// We need to make sure winsock2 is included before windows.h, or we will get redefinitions of symbols
     1.8 -// as windows.h includes winsock1.h, so we will have duplicate symbols if windows.h is included first.
     1.9 -// It seems some of our code includes sync.h before including winsock.h, leading to the failure.
    1.10 -// Including winsock2.h here fixes the problem for now...
    1.11 -#ifdef WIN32 
    1.12 -#include <winsock2.h>
    1.13 -#endif // WIN32 
    1.14 +// We need to make sure winsock2 is included before windows.h, or we will get redefinitions of symbols
    1.15 +// as windows.h includes winsock1.h, so we will have duplicate symbols if windows.h is included first.
    1.16 +// It seems some of our code includes sync.h before including winsock.h, leading to the failure.
    1.17 +// Including winsock2.h here fixes the problem for now...
    1.18 +#ifdef WIN32 
    1.19 +#include <winsock2.h>
    1.20 +#endif // WIN32 
    1.21  
    1.22  #include <Rpc.h>
    1.23  #include <string.h>