#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 b7f178e..a371cb3 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -129,7 +129,7 @@
 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 3764740..b99a541 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -180,7 +180,7 @@
 		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. */