Mercurial > hg > xemacs-beta
diff src/win32.c @ 4854:95c4ced5c07c
fix compile problems
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-14 Ben Wing <ben@xemacs.org>
* glyphs-eimage.c:
Turn on fixes for conflicts between jmorecfg.h and windows.h on
Cygwin, too.
* emacs.c (debug_can_access_memory):
* lisp.h:
Declare function const void * to avoid warnings.
* sysfile.h:
Include syswindows.h on Windows to avoid problems using things like
PATHNAME_CONVERT_OUT.
* sysfile.h (X_OK):
* dialog-msw.c (handle_directory_proc):
* dialog-msw.c (handle_directory_dialog_box):
* nt.c (Fmswindows_short_file_name):
* sysdep.c (qxe_allocating_getcwd):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* unexcw.c (unexec):
* unexnt.c (_start):
* win32.c (mswindows_read_link_1):
Rename PATH_MAX_EXTERNAL to PATH_MAX_TSTR to reflect its actual
semantics.
* unexcw.c:
Remove include of syswindows.h that had been added because
sysfile.h didn't include it.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 14 Jan 2010 01:25:16 -0600 |
| parents | b3ea9c582280 |
| children | c356806cc933 |
line wrap: on
line diff
--- a/src/win32.c Wed Jan 13 19:43:16 2010 -0600 +++ b/src/win32.c Thu Jan 14 01:25:16 2010 -0600 @@ -521,7 +521,7 @@ { Extbyte *fname_unicode; WIN32_FIND_DATAW wfd; - LPWSTR resolved = alloca_array (WCHAR, PATH_MAX_EXTERNAL + 1); + LPWSTR resolved = alloca_array (WCHAR, PATH_MAX_TCHAR + 1); /* Always Unicode. Not obvious from the IPersistFile documentation, but look under @@ -546,10 +546,10 @@ /* Another Cygwin prototype error, fixed in v2.2 of w32api */ XECOMCALL4 (psl, GetPath, (LPSTR) resolved, - PATH_MAX_EXTERNAL, &wfd, 0) + PATH_MAX_TCHAR, &wfd, 0) #else XECOMCALL4 (psl, GetPath, resolved, - PATH_MAX_EXTERNAL, &wfd, 0) + PATH_MAX_TCHAR, &wfd, 0) #endif == S_OK) TSTR_TO_C_STRING_MALLOC (resolved, retval); @@ -579,7 +579,7 @@ { Extbyte *fname_unicode; WIN32_FIND_DATAA wfd; - LPSTR resolved = alloca_array (CHAR, PATH_MAX_EXTERNAL + 1); + LPSTR resolved = alloca_array (CHAR, PATH_MAX_TCHAR + 1); /* Always Unicode. Not obvious from the IPersistFile documentation, but look under @@ -591,7 +591,7 @@ (LPWSTR) fname_unicode, STGM_READ) == S_OK && XECOMCALL4 (psl, GetPath, resolved, - PATH_MAX_EXTERNAL, &wfd, 0) == S_OK) + PATH_MAX_TCHAR, &wfd, 0) == S_OK) TSTR_TO_C_STRING_MALLOC (resolved, retval); XECOMCALL0 (ppf, Release);