2 files changed, 6 insertions, 1 deletions
diff --git a/clang/Driver/ASTConsumers.h b/clang/Driver/ASTConsumers.h
index 0093a7046ac..2032a2d598c 100644
--- a/clang/Driver/ASTConsumers.h
+++ b/clang/Driver/ASTConsumers.h
@@ -30,7 +30,7 @@ class FileManager;
 class Preprocessor;
 class PreprocessorFactory;
 struct CompileOptions;
-struct LangOptions;
+class LangOptions;
 
 ASTConsumer *CreateASTPrinter(llvm::raw_ostream* OS = NULL);
 
diff --git a/clang/Driver/CacheTokens.cpp b/clang/Driver/CacheTokens.cpp
index 02e9f6cff01..d2921f0152c 100644
--- a/clang/Driver/CacheTokens.cpp
+++ b/clang/Driver/CacheTokens.cpp
@@ -26,6 +26,11 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Streams.h"
 
+// FIXME: put this somewhere else?
+#ifndef S_ISDIR
+#define S_ISDIR(x) (((x)&_S_IFDIR)!=0)
+#endif
+
 using namespace clang;
 
 typedef uint32_t Offset;