Mercurial > hg > xemacs-beta

comparison src/glyphs-eimage.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 19a72041c5ed
comparison
equal deleted inserted replaced
4853:d35e231d347d 4854:95c4ced5c07c
98 * JPEG * 98 * JPEG *
99 **********************************************************************/ 99 **********************************************************************/
100 100
101 BEGIN_C_DECLS 101 BEGIN_C_DECLS
102 102
103 #ifdef WIN32_NATIVE 103 #ifdef WIN32_ANY
104 /* #### Yuck! More horrifitude. tiffio.h, below, includes <windows.h>, 104 /* #### Yuck! More horrifitude. tiffio.h, below, and sysfile.h above,
105 which defines INT32 and INT16, the former differently and incompatibly 105 include <windows.h>, which defines INT32 and INT16, the former
106 from jmorecfg.h, included by jpeglib.h. We can disable the stuff in 106 differently and incompatibly from jmorecfg.h, included by jpeglib.h. We
107 jmorecfg.h by defining XMD_H (clever, huh?); then we define these 107 can disable the stuff in jmorecfg.h by defining XMD_H (clever, huh?);
108 typedefs the way that <windows.h> wants them (which is more correct, 108 then we define these typedefs the way that <windows.h> wants them (which
109 anyway; jmorecfg.h defines INT32 as `long'). */ 109 is more correct, anyway; jmorecfg.h defines INT32 as `long'). */
110 #define XMD_H 110 #define XMD_H
111 typedef signed int INT32; 111 typedef signed int INT32;
112 typedef signed short INT16; 112 typedef signed short INT16;
113 113
114 /* And another one... jmorecfg.h defines the 'boolean' type as int, 114 /* And another one... jmorecfg.h defines the 'boolean' type as int,