Update headers to llvm-3.3. Tested with vmkit + GNU Classpath.
Peter Senna Tschudin [Mon, 22 Jul 2013 16:01:16 +0000 (18:01 +0200)]
scilab/modules/ast/includes/JITvisitor.hxx
scilab/modules/core/src/cpp/tasks.cpp

index 0366a7e..51240b7 100644 (file)
@@ -57,17 +57,17 @@ extern "C" {
 
 #undef ID
 #undef LT
-#include "llvm/DerivedTypes.h"
-#include "llvm/IRBuilder.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
 
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/JIT.h"
 #include "llvm/PassManager.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
 #include "vmkit_core.h"
 
 namespace ast
@@ -116,7 +116,7 @@ namespace ast
 
         void visit (const SimpleVar &e)
         {
-           visitprivate(e);
+            visitprivate(e);
         }
 
 
index 32582ea..cefa01b 100644 (file)
@@ -16,7 +16,6 @@
 #include "visitor.hxx"
 #include "printvisitor.hxx"
 #include "execvisitor.hxx"
-#include "JITvisitor.hxx"
 #include "timedvisitor.hxx"
 #include "debugvisitor.hxx"
 #include "stepvisitor.hxx"
 //Needed as both llvm and scilab has #define ...
 #undef ID
 #undef LT
+#undef TRY
+#undef CATCH
+#undef END
 
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/IRBuilder.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
+#include "JITvisitor.hxx"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
 #include "llvm/Analysis/Verifier.h"
 #include <cstdio>
 #include <string>