Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/src/glyphs-eimage.c	Wed Jan 13 19:43:16 2010 -0600
+++ b/src/glyphs-eimage.c	Thu Jan 14 01:25:16 2010 -0600
@@ -100,13 +100,13 @@
 
 BEGIN_C_DECLS
 
-#ifdef WIN32_NATIVE
-/* #### Yuck!  More horrifitude.  tiffio.h, below, includes <windows.h>,
-   which defines INT32 and INT16, the former differently and incompatibly
-   from jmorecfg.h, included by jpeglib.h.  We can disable the stuff in
-   jmorecfg.h by defining XMD_H (clever, huh?); then we define these
-   typedefs the way that <windows.h> wants them (which is more correct,
-   anyway; jmorecfg.h defines INT32 as `long'). */
+#ifdef WIN32_ANY
+/* #### Yuck!  More horrifitude.  tiffio.h, below, and sysfile.h above,
+   include <windows.h>, which defines INT32 and INT16, the former
+   differently and incompatibly from jmorecfg.h, included by jpeglib.h.  We
+   can disable the stuff in jmorecfg.h by defining XMD_H (clever, huh?);
+   then we define these typedefs the way that <windows.h> wants them (which
+   is more correct, anyway; jmorecfg.h defines INT32 as `long'). */
 #define XMD_H
 typedef signed int INT32;
 typedef signed short INT16;