diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-02-02 15:34:12 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-02-02 15:34:12 +0000 |
| commit | 3571d8115f4f62022889761bef2af024b4ff9fd1 (patch) | |
| tree | 27b342f4edc370ce2c49a4a1ee2be4f00c1d0cf7 | |
| parent | 28626de45201fcfc575f6ffcc6af849673f04476 (diff) | |
| download | cpython-git-3571d8115f4f62022889761bef2af024b4ff9fd1.tar.gz | |
Merged revisions 69207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r69207 | martin.v.loewis | 2009-02-02 16:32:22 +0100 (Mo, 02 Feb 2009) | 9 lines
Merged revisions 69205 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69205 | martin.v.loewis | 2009-02-02 15:23:16 +0100 (Mo, 02 Feb 2009) | 1 line
Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows.
........
................
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PC/getpathp.c | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -252,6 +252,8 @@ Tools/Demos Build ----- +- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. + - Issue #4472: "configure --enable-shared" now works on OSX - Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds. diff --git a/PC/getpathp.c b/PC/getpathp.c index 669ed9f0b3..36abbf24ab 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -200,6 +200,7 @@ search_for_prefix(wchar_t *argv0_path, wchar_t *landmark) } #ifdef MS_WINDOWS +#ifdef Py_ENABLE_SHARED /* a string loaded from the DLL at startup.*/ extern const char *PyWin_DLLVersionString; @@ -349,6 +350,7 @@ done: free(keyBuf); return retval; } +#endif /* Py_ENABLE_SHARED */ #endif /* MS_WINDOWS */ static void @@ -359,11 +361,15 @@ get_progpath(void) wchar_t *prog = Py_GetProgramName(); #ifdef MS_WINDOWS +#ifdef Py_ENABLE_SHARED extern HANDLE PyWin_DLLhModule; /* static init of progpath ensures final char remains \0 */ if (PyWin_DLLhModule) if (!GetModuleFileNameW(PyWin_DLLhModule, dllpath, MAXPATHLEN)) dllpath[0] = 0; +#else + dllpath[0] = 0; +#endif if (GetModuleFileNameW(NULL, progpath, MAXPATHLEN)) return; #endif @@ -471,8 +477,10 @@ calculate_path(void) } skiphome = pythonhome==NULL ? 0 : 1; +#ifdef Py_ENABLE_SHARED machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome); userpath = getpythonregpath(HKEY_CURRENT_USER, skiphome); +#endif /* We only use the default relative PYTHONPATH if we havent anything better to use! */ skipdefault = envpath!=NULL || pythonhome!=NULL || \ |