Mercurial > hg > xemacs-beta
changeset 1684:fba0799e2d79
[xemacs-hg @ 2003-09-15 20:21:44 by james]
Remove references to GetLongPathNameW since old Windows doesn't have it
and we aren't using it anyway.
| author | james |
|---|---|
| date | Mon, 15 Sep 2003 20:21:47 +0000 |
| parents | 74353ce403ce |
| children | 29c45c1b64f3 |
| files | src/ChangeLog src/intl-auto-encap-win32.c src/intl-auto-encap-win32.h src/intl-encap-win32.c |
| diffstat | 4 files changed, 10 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Sep 15 15:24:57 2003 +0000 +++ b/src/ChangeLog Mon Sep 15 20:21:47 2003 +0000 @@ -1,3 +1,10 @@ +2002-07-04 Jonathan Harris <jonathan@xemacs.org> + + * intl-encap-win32.c: + * intl-auto-encap-win32.c: + * intl-auto-encap-win32.h: + Remove GetLongPathNameW - API not available on Win95/NT4 + 2003-09-15 Jerry James <james@xemacs.org> * syswindows.h: Quiet compiler warnings about struct stat.
--- a/src/intl-auto-encap-win32.c Mon Sep 15 15:24:57 2003 +0000 +++ b/src/intl-auto-encap-win32.c Mon Sep 15 20:21:47 2003 +0000 @@ -2571,14 +2571,7 @@ return GetShortPathNameA ((LPCSTR) lpszLongPath, (LPSTR) lpszShortPath, cchBuffer); } -DWORD -qxeGetLongPathName (const Extbyte * lpszShortPath, Extbyte * lpszLongPath, DWORD cchBuffer) -{ - if (XEUNICODE_P) - return GetLongPathNameW ((LPCWSTR) lpszShortPath, (LPWSTR) lpszLongPath, cchBuffer); - else - return GetLongPathNameA ((LPCSTR) lpszShortPath, (LPSTR) lpszLongPath, cchBuffer); -} +/* Error if GetLongPathName used: Win98/2K+ only */ /* Skipping GetEnvironmentStrings because misnamed ANSI version of the function */
--- a/src/intl-auto-encap-win32.h Mon Sep 15 15:24:57 2003 +0000 +++ b/src/intl-auto-encap-win32.h Mon Sep 15 20:21:47 2003 +0000 @@ -1825,11 +1825,8 @@ #endif DWORD qxeGetShortPathName (const Extbyte * lpszLongPath, Extbyte * lpszShortPath, DWORD cchBuffer); -#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED #undef GetLongPathName -#define GetLongPathName error use qxeGetLongPathName or GetLongPathNameA/GetLongPathNameW -#endif -DWORD qxeGetLongPathName (const Extbyte * lpszShortPath, Extbyte * lpszLongPath, DWORD cchBuffer); +#define GetLongPathName error Win98/2K+ only /* Skipping GetEnvironmentStrings because misnamed ANSI version of the function */
--- a/src/intl-encap-win32.c Mon Sep 15 15:24:57 2003 +0000 +++ b/src/intl-encap-win32.c Mon Sep 15 20:21:47 2003 +0000 @@ -216,7 +216,7 @@ yes GetBinaryType yes GetShortPathName -yes GetLongPathName +no GetLongPathName Win98/2K+ only skip GetEnvironmentStrings misnamed ANSI version of the function yes FreeEnvironmentStrings yes FormatMessage