#4532: fixes to make 3.x compile on QNX 6.3.2 (reported by Matt Kraai)

diff --git a/Modules/getpath.c b/Modules/getpath.c
index b7f178eb7ab1a2aee627c92ccf6f57e92eaa35f8..a371cb37a5fd8bc79c37fe71c25eee89af424424 100644 (file)
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -129,7 +129,7 @@ static wchar_t prefix[MAXPATHLEN+1];
 static wchar_t exec_prefix[MAXPATHLEN+1];
 static wchar_t progpath[MAXPATHLEN+1];
 static wchar_t *module_search_path = NULL;
-static wchar_t lib_python[] = L"lib/python" VERSION;
+static wchar_t *lib_python = L"lib/python" VERSION;
 
 /* In principle, this should use HAVE__WSTAT, and _wstat
    should be detected by autoconf. However, no current

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 3764740e81c577f29093bd806fbcaa9a03a89b60..b99a541d54202c2f7b5f9e0d47db8245d402ce24 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -180,7 +180,7 @@ Py_InitializeEx(int install_sigs)
                return;
        initialized = 1;
 
-#ifdef HAVE_SETLOCALE
+#if defined(HAVE_LANGINFO_H) && defined(HAVE_SETLOCALE)
        /* Set up the LC_CTYPE locale, so we can obtain
           the locale's charset without having to switch
           locales. */