diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2010-02-22 23:26:10 (GMT) |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2010-02-22 23:26:10 (GMT) |
| commit | b2ceb3ad9e30db522ee26fe340af18397c607c24 (patch) | |
| tree | 629a4813a37482459e3b77fe655a3597522a35a6 | |
| parent | e1f9bebd991bc8aff0f4f1ca8774b029eb875584 (diff) | |
| download | cpython-b2ceb3ad9e30db522ee26fe340af18397c607c24.zip cpython-b2ceb3ad9e30db522ee26fe340af18397c607c24.tar.gz cpython-b2ceb3ad9e30db522ee26fe340af18397c607c24.tar.bz2 | |
#4532: fixes to make 3.x compile on QNX 6.3.2 (reported by Matt Kraai)
| -rw-r--r-- | Modules/getpath.c | 2 | ||||
| -rw-r--r-- | Python/pythonrun.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 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 3764740..b99a541 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. */ |