summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/llvm/Config/llvm-platform-config.h2
-rw-r--r--include/llvm/Target/TargetLibraryInfo.h11
2 files changed, 12 insertions, 1 deletions
diff --git a/include/llvm/Config/llvm-platform-config.h b/include/llvm/Config/llvm-platform-config.h
index cd005be..c9e82da 100644
--- a/include/llvm/Config/llvm-platform-config.h
+++ b/include/llvm/Config/llvm-platform-config.h
@@ -141,7 +141,7 @@
#define HAVE_LIBIMAGEHLP 1
/* Type of 1st arg on ELM Callback */
-#define WIN32_ELMCB_PCSTR PSTR
+#define WIN32_ELMCB_PCSTR PCSTR
#else /* Linux, Mac OS X, ... Unixish platform */
diff --git a/include/llvm/Target/TargetLibraryInfo.h b/include/llvm/Target/TargetLibraryInfo.h
index d4f9f23..93c9aa3 100644
--- a/include/llvm/Target/TargetLibraryInfo.h
+++ b/include/llvm/Target/TargetLibraryInfo.h
@@ -13,6 +13,17 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/Pass.h"
+// BEGIN ANDROID-SPECIFIC
+#ifdef WIN32
+#ifdef fseeko
+#undef fseeko
+#endif
+#ifdef ftello
+#undef ftello
+#endif
+#endif // WIN32
+// END ANDROID-SPECIFIC
+
namespace llvm {
class Triple;