comparison src/dialog-msw.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 8b63e21b0436
comparison
equal deleted inserted replaced
4853:d35e231d347d 4854:95c4ced5c07c
342 342
343 static int 343 static int
344 CALLBACK handle_directory_proc (HWND hwnd, UINT msg, 344 CALLBACK handle_directory_proc (HWND hwnd, UINT msg,
345 LPARAM lParam, LPARAM lpData) 345 LPARAM lParam, LPARAM lpData)
346 { 346 {
347 Extbyte szDir[PATH_MAX_EXTERNAL]; 347 Extbyte szDir[PATH_MAX_TCHAR];
348 struct param_data *pd = (struct param_data *) lpData; 348 struct param_data *pd = (struct param_data *) lpData;
349 349
350 switch (msg) 350 switch (msg)
351 { 351 {
352 case BFFM_INITIALIZED: 352 case BFFM_INITIALIZED:
428 if (SHGetMalloc (&pMalloc) == NOERROR) 428 if (SHGetMalloc (&pMalloc) == NOERROR)
429 { 429 {
430 pidl = qxeSHBrowseForFolder (&bi); 430 pidl = qxeSHBrowseForFolder (&bi);
431 if (pidl) 431 if (pidl)
432 { 432 {
433 Extbyte *szDir = alloca_extbytes (PATH_MAX_EXTERNAL); 433 Extbyte *szDir = alloca_extbytes (PATH_MAX_TCHAR);
434 434
435 if (qxeSHGetPathFromIDList (pidl, szDir)) 435 if (qxeSHGetPathFromIDList (pidl, szDir))
436 ret = tstr_to_local_file_format (szDir); 436 ret = tstr_to_local_file_format (szDir);
437 437
438 XECOMCALL1 (pMalloc, Free, pidl); 438 XECOMCALL1 (pMalloc, Free, pidl);