[llvm] r284968 - Fix windows builds by swapping windows.h and wincrypt.h ordering.

Simon Pilgrim via llvm-commits llvm-commits at lists.llvm.org
Mon Oct 24 05:39:24 PDT 2016


Author: rksimon
Date: Mon Oct 24 07:39:23 2016
New Revision: 284968

URL: http://llvm.org/viewvc/llvm-project?rev=284968&view=rev
Log:
Fix windows builds by swapping windows.h and wincrypt.h ordering.

We need to include windows.h first even though it breaks default include ordering rules

Modified:
    llvm/trunk/lib/Support/Windows/WindowsSupport.h

Modified: llvm/trunk/lib/Support/Windows/WindowsSupport.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/WindowsSupport.h?rev=284968&r1=284967&r2=284968&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/WindowsSupport.h (original)
+++ llvm/trunk/lib/Support/Windows/WindowsSupport.h Mon Oct 24 07:39:23 2016
@@ -44,8 +44,8 @@
 #include <cassert>
 #include <string>
 #include <system_error>
-#include <wincrypt.h>
 #include <windows.h>
+#include <wincrypt.h> // FIXME: must be included after windows.h
 
 /// Determines if the program is running on Windows 8 or newer. This
 /// reimplements one of the helpers in the Windows 8.1 SDK, which are intended




More information about the llvm-commits mailing list