Issue #26920: Merge 3.6

This commit is contained in:
Xavier de Gaye 2016-11-16 07:26:10 +01:00
commit afa94a5a3e
2 changed files with 4 additions and 1 deletions

View file

@ -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. */