From: Andrew M. Kuchling <amk@amk.ca>
Date: Mon, 22 Feb 2010 23:26:10 +0000 (+0000)
Subject: #4532: fixes to make 3.x compile on QNX 6.3.2 (reported by Matt Kraai)
X-Git-Tag: v3.2a1~1652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2ceb3ad9e30db522ee26fe340af18397c607c24;p=thirdparty%2FPython%2Fcpython.git

#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 b7f178eb7ab1..a371cb37a5fd 100644
--- 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 3764740e81c5..b99a541d5420 100644
--- 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. */