summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorxdegaye <xdegaye@gmail.com>2017-11-23 10:44:38 (GMT)
committerGitHub <noreply@github.com>2017-11-23 10:44:38 (GMT)
commitc06c22e9a9fb9326e79fcf1551601eacc1fd457d (patch)
treef38029612fd0dcc789f3f7d60ca134911dced9f1 /Include
parent5ad7ef8e420de8a54fb30ed37362194c6b96012c (diff)
downloadcpython-c06c22e9a9fb9326e79fcf1551601eacc1fd457d.zip
cpython-c06c22e9a9fb9326e79fcf1551601eacc1fd457d.tar.gz
cpython-c06c22e9a9fb9326e79fcf1551601eacc1fd457d.tar.bz2
bpo-29040: Support building Android with Unified Headers (GH-4492)
Diffstat (limited to 'Include')
-rw-r--r--Include/pyport.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 0e82543..f2e247a 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -784,7 +784,9 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
#endif /* Py_BUILD_CORE */
#ifdef __ANDROID__
-#include <android/api-level.h>
+/* The Android langinfo.h header is not used. */
+#undef HAVE_LANGINFO_H
+#undef CODESET
#endif
/* Maximum value of the Windows DWORD type */