Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 4854:95c4ced5c07c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d8d92ad084b8
comparison
equal deleted inserted replaced
4853:d35e231d347d 4854:95c4ced5c07c
3352 3352
3353 #ifdef WIN32_ANY 3353 #ifdef WIN32_ANY
3354 3354
3355 /* Return whether all bytes in the specified memory block can be read. */ 3355 /* Return whether all bytes in the specified memory block can be read. */
3356 int 3356 int
3357 debug_can_access_memory (void *ptr, Bytecount len) 3357 debug_can_access_memory (const void *ptr, Bytecount len)
3358 { 3358 {
3359 return !IsBadReadPtr (ptr, len); 3359 return !IsBadReadPtr (ptr, len);
3360 } 3360 }
3361 3361
3362 #else /* !WIN32_ANY */ 3362 #else /* !WIN32_ANY */
3373 LONGJMP (memory_error_jump, 1); 3373 LONGJMP (memory_error_jump, 1);
3374 } 3374 }
3375 3375
3376 /* Return whether all bytes in the specified memory block can be read. */ 3376 /* Return whether all bytes in the specified memory block can be read. */
3377 int 3377 int
3378 debug_can_access_memory (void *ptr, Bytecount len) 3378 debug_can_access_memory (const void *ptr, Bytecount len)
3379 { 3379 {
3380 /* Use volatile to protect variables from being clobbered by longjmp. */ 3380 /* Use volatile to protect variables from being clobbered by longjmp. */
3381 SIGTYPE (*volatile old_sigbus) (int); 3381 SIGTYPE (*volatile old_sigbus) (int);
3382 SIGTYPE (*volatile old_sigsegv) (int); 3382 SIGTYPE (*volatile old_sigsegv) (int);
3383 volatile int old_errno = errno; 3383 volatile int old_errno = errno;