Created
March 13, 2013 09:58
-
-
Save bandwidthcrunch/5150691 to your computer and use it in GitHub Desktop.
mandroid fixes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| build/core/comboHOST_linux-x86.mk | |
| -HOST_GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=0 | |
| +HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 | |
| external/gtest/internal/gtest-param-util.h | |
| #include <vector> | |
| +#include <cstddef> | |
| #include <gtest/internal/gtest-port.h> | |
| external/libpp/format_output.h b/libpp/format_output.h | |
| - mutable counts_t & counts; | |
| + counts_t & counts; | |
| android/ics/frameworks/compile/slang/Android.mk | |
| -local_cflags_for_slang := -Wno-sign-promo -Wall -Wno-unused-parameter | |
| -Werror | |
| +local_cflags_for_slang := -Wno-sign-promo -Wall -Wno-unused-parameter | |
| a/lib/Support/Mutex.cpp b/lib/Support/Mutex.cpp | |
| +#undef ENABLE_THREADS | |
| +#undef HAVE_PTHREAD_H | |
| diff --git a/lib/Support/Signals.cpp b/lib/Support/Signals.cpp | |
| +#undef HAVE_DLFCN_H | |
| + | |
| diff --git a/lib/Support/Threading.cpp b/lib/Support/Threading.cpp | |
| index 2957956..f1339a3 100644 | |
| --- a/lib/Support/Threading.cpp | |
| +++ b/lib/Support/Threading.cpp | |
| @@ -16,6 +16,7 @@ | |
| #include "llvm/Support/Mutex.h" | |
| #include "llvm/Config/config.h" | |
| #include <cassert> | |
| +#undef LLVM_MULTITHREADED | |
| a/src/glsl/linker.cpp b/src/glsl/linker.cpp | |
| #include <climits> | |
| +#include <cstddef> | |
| #include <pixelflinger2/pixelflinger2_interface.h> | |
| @@ -1762,4 +1763,4 | |
| -} | |
| \ No newline at end of file | |
| +} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment