diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-06-30 15:26:10 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-06-30 15:26:10 (GMT) |
| commit | 6238d2b024f061159b2613387ff700695c10deef (patch) | |
| tree | 2c882431a5f1a348c7b4589f0e51a7e0d8bdef46 /Python/dynload_win.c | |
| parent | adfa7409f8286bd9581d5decfac5a5edcc1aa7de (diff) | |
| download | cpython-6238d2b024f061159b2613387ff700695c10deef.zip cpython-6238d2b024f061159b2613387ff700695c10deef.tar.gz cpython-6238d2b024f061159b2613387ff700695c10deef.tar.bz2 | |
Patch #569753: Remove support for WIN16.
Rename all occurrences of MS_WIN32 to MS_WINDOWS.
Diffstat (limited to 'Python/dynload_win.c')
| -rw-r--r-- | Python/dynload_win.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 9062cf3..7178962 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -20,8 +20,6 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { }; -#ifdef MS_WIN32 - /* Case insensitive string compare, to avoid any dependencies on particular C RTL implementations */ @@ -150,7 +148,6 @@ static char *GetPythonImport (HINSTANCE hModule) return NULL; } -#endif /* MS_WIN32 */ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, @@ -161,7 +158,6 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname); -#ifdef MS_WIN32 { HINSTANCE hDLL = NULL; char pathbuf[260]; @@ -242,31 +238,6 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, } p = GetProcAddress(hDLL, funcname); } -#endif /* MS_WIN32 */ -#ifdef MS_WIN16 - { - HINSTANCE hDLL; - char pathbuf[16]; - if (strchr(pathname, '\\') == NULL && - strchr(pathname, '/') == NULL) - { - /* Prefix bare filename with ".\" */ - PyOS_snprintf(pathbuf, sizeof(pathbuf), - ".\\%-.13s", pathname); - pathname = pathbuf; - } - hDLL = LoadLibrary(pathname); - if (hDLL < HINSTANCE_ERROR){ - char errBuf[256]; - PyOS_snprintf(errBuf, sizeof(errBuf), - "DLL load failed with error code %d", - hDLL); - PyErr_SetString(PyExc_ImportError, errBuf); - return NULL; - } - p = GetProcAddress(hDLL, funcname); - } -#endif /* MS_WIN16 */ return p; } |