summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorXavier de Gaye <xdegaye@users.sourceforge.net>2016-11-16 07:26:10 +0100
committerXavier de Gaye <xdegaye@users.sourceforge.net>2016-11-16 07:26:10 +0100
commitafa94a5a3ec7ef66f00fc5ab284d2665f04996be (patch)
tree575cc4089e0cae222131e351db5406ce9b9863f5 /Python
parenta97872a1fe49a511688a133a3974f0b68fa7edc0 (diff)
parentb445ad7b04438b0a8507117d216d756088ea1848 (diff)
downloadcpython-git-afa94a5a3ec7ef66f00fc5ab284d2665f04996be.tar.gz
Issue #26920: Merge 3.6
Diffstat (limited to 'Python')
-rw-r--r--Python/pylifecycle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 5b5cc2b55e..71f23dd150 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -315,7 +315,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)
initialized = 1;
_Py_Finalizing = NULL;
-#if defined(HAVE_LANGINFO_H) && defined(HAVE_SETLOCALE)
+#ifdef HAVE_SETLOCALE
/* Set up the LC_CTYPE locale, so we can obtain
the locale's charset without having to switch
locales. */