Revert "Revert "Another try at making MSVC happy again.""

This didn't work out either.

Discussion at:
  http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20140505/105302.html

This reverts commit r208513.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208514 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h
index b01e39a33196fcec44d94a4be4e0f3bcdba45c89..f4cc7fd38b6326bc6e0077d145fd35ac33747c5b 100644 (file)
--- a/include/clang/Basic/Diagnostic.h
+++ b/include/clang/Basic/Diagnostic.h
@@ -16,6 +16,7 @@
 #define LLVM_CLANG_DIAGNOSTIC_H
 
 #include "clang/Basic/DiagnosticIDs.h"
+#include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
@@ -32,7 +33,6 @@ namespace clang {
   class DiagnosticOptions;
   class IdentifierInfo;
   class LangOptions;
-  enum OverloadsShown : unsigned;
   class Preprocessor;
   class StoredDiagnostic;
   namespace tok {