aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2019-02-14 21:00:06 -0800
committerDan Willemsen <dwillemsen@google.com>2019-02-14 21:01:41 -0800
commit04e39106a2aaf9e0381f07f787a5dcfb8657b519 (patch)
treeefbff7c6e80602542add1eeee97c9fc2d4583d17
parentdbcebe04a0fb6f548d0d1481359cf4e380854698 (diff)
downloadplatform_external_python_cpython2-04e39106a2aaf9e0381f07f787a5dcfb8657b519.tar.gz
platform_external_python_cpython2-04e39106a2aaf9e0381f07f787a5dcfb8657b519.tar.bz2
platform_external_python_cpython2-04e39106a2aaf9e0381f07f787a5dcfb8657b519.zip
Silence warnings
Test: cd external/python/cpython2; mma Change-Id: Iaba33d9a46b6da20b8cdac0a085eb0911c4825d0
-rw-r--r--Android.bp9
-rw-r--r--Python/thread.c3
2 files changed, 7 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index f161d8f86d..5497151366 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,8 +25,7 @@ cc_defaults {
"-Wstrict-prototypes",
"-DPy_BUILD_CORE",
"-Werror",
- "-Wno-error=invalid-source-encoding",
- "-Wno-error=macro-redefined",
+ "-Wno-invalid-source-encoding",
"-Wno-int-conversion",
"-Wno-missing-field-initializers",
"-Wno-null-pointer-arithmetic",
@@ -809,7 +808,7 @@ cc_library_static {
android: {
shared_libs: [
"libsqlite",
- ]
+ ],
},
},
}
@@ -866,7 +865,7 @@ cc_library_static {
"Modules/_ctypes/libffi/src/arm/ffi.c",
"Modules/_ctypes/libffi/src/arm/sysv.S",
"Modules/_ctypes/libffi/src/arm/trampoline.S",
- ]
+ ],
},
arm64: {
// arithmetic on a pointer in _ctypes/libffi/src/aarch64/ffi.c
@@ -878,7 +877,7 @@ cc_library_static {
srcs: [
"Modules/_ctypes/libffi/src/aarch64/ffi.c",
"Modules/_ctypes/libffi/src/aarch64/sysv.S",
- ]
+ ],
},
},
target: {
diff --git a/Python/thread.c b/Python/thread.c
index 3b69f961a4..8ac40f95d1 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -62,6 +62,9 @@
#endif /* _POSIX_THREADS */
+#ifdef dprintf
+#undef dprintf
+#endif
#ifdef Py_DEBUG
static int thread_debug = 0;
#define dprintf(args) (void)((thread_debug & 1) && printf args)