[llvm] r304843 - Fix the includes in lib/Fuzzer on Windows that have ordering

[Chandler Carruth via llvm-commits]

Author: chandlerc
Date: Tue Jun  6 18:28:01 2017
New Revision: 304843

URL: http://llvm.org/viewvc/llvm-project?rev=304843&view=rev
Log:
Fix the includes in lib/Fuzzer on Windows that have ordering
dependencies and add comments to tell future maintainers about those
requirements.

Modified:
    llvm/trunk/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp
    llvm/trunk/lib/Fuzzer/FuzzerUtilWindows.cpp

Modified: llvm/trunk/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp?rev=304843&r1=304842&r2=304843&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp Tue Jun  6 18:28:01 2017
@@ -13,9 +13,11 @@
 
 #include "FuzzerExtFunctions.h"
 #include "FuzzerIO.h"
-#include "Psapi.h"
 #include "Windows.h"
 
+// This must be included after Windows.h.
+#include "Psapi.h"
+
 namespace fuzzer {
 
 ExternalFunctions::ExternalFunctions() {

Modified: llvm/trunk/lib/Fuzzer/FuzzerUtilWindows.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerUtilWindows.cpp?rev=304843&r1=304842&r2=304843&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerUtilWindows.cpp (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerUtilWindows.cpp Tue Jun  6 18:28:01 2017
@@ -12,7 +12,6 @@
 #if LIBFUZZER_WINDOWS
 #include "FuzzerIO.h"
 #include "FuzzerInternal.h"
-#include <Psapi.h>
 #include <cassert>
 #include <chrono>
 #include <cstring>
@@ -24,6 +23,9 @@
 #include <sys/types.h>
 #include <windows.h>
 
+// This must be included after windows.h.
+#include <Psapi.h>
+
 namespace fuzzer {
 
 static const FuzzingOptions* HandlerOpt = nullptr;