Mercurial > hg > xemacs-beta
comparison src/glyphs-eimage.c @ 2500:3d8143fc88e1
[xemacs-hg @ 2005-01-24 23:33:30 by ben]
get working with VC7
config.inc.samp: Declare OPTIONAL_LIBRARY_DIR as root of library directories.
Redo all graphics library defaults to mirror the versions and
directories in the current binary aux distribution on xemacs
web site. Enable TIFF and COMPFACE by default since you can
now compile with them and binary libs are provided.
xemacs.mak: Put our own directories first in case of conflict (e.g. config.h
in compface).
xemacs.mak: Use MSVCRT to avoid link problems.
s/windowsnt.h:
bytecode.c, print.c: Add casts to avoid warning.
compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and
friends here, like for GCC. Need different definitions for VC7
and VC6.
s/windowsnt.h: Remove stuff moved to compiler.h. Disable warning 4646 ("function
declared with __declspec(noreturn) has non-void return type")
on VC7 since lots of Lisp primitives trigger this and there is
no easy way to kludge around the warning.
glyphs-eimage.c: Some really nasty hacks to allow TIFF and JPEG to both be compiled.
#### The better solution is to move the TIFF and JPEG code to
different files.
glyphs-msw.c: Define __STDC__ to avoid problems with compface.h.
intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, syswindows.h: Those wankers at Microsoft cannot leave well enough alone.
Various functions change parameter types semi-randomly between
VC6 and VC7, so we need to include our own versions that
can handle both kinds with appropriate casting.
EmacsFrame.c, EmacsShell-sub.c, EmacsShell.c, alloc.c, alloca.c, buffer.c, bytecode.c, charset.h, chartab.c, cm.c, console-stream.c, console.c, data.c, debug.h, device-msw.c, device-tty.c, device-x.c, doprnt.c, dumper.c, dynarr.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, free-hook.c, gccache-gtk.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, glyphs.c, gtk-glue.c, gutter.c, input-method-xlib.c, insdel.c, intl-win32.c, keymap.c, lisp.h, lread.c, lstream.c, macros.c, malloc.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, mule-coding.c, native-gtk-toolbar.c, number.c, objects-msw.c, objects.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, regex.c, scrollbar-gtk.c, scrollbar-x.c, search.c, select-x.c, signal.c, specifier.c, specifier.h, strftime.c, sunplay.c, symbols.c, sysdep.c, sysproc.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, ui-gtk.c, unexnt.c, unicode.c, win32.c, window.c, xgccache.c, s/windowsnt.h: abort() -> ABORT(). Eliminate preprocessor games with abort()
since it creates huge problems in VC7, solvable only by including
massive amounts of files in every compile (and not worth it).
author | ben |
---|---|
date | Mon, 24 Jan 2005 23:34:34 +0000 |
parents | ecf1ebac70d8 |
children | 6bee993389f3 |
comparison
equal
deleted
inserted
replaced
2499:4c5ee4d2e921 | 2500:3d8143fc88e1 |
---|---|
101 /********************************************************************** | 101 /********************************************************************** |
102 * JPEG * | 102 * JPEG * |
103 **********************************************************************/ | 103 **********************************************************************/ |
104 | 104 |
105 BEGIN_C_DECLS | 105 BEGIN_C_DECLS |
106 | |
107 #ifdef WIN32_NATIVE | |
108 /* #### Yuck! More horrifitude. tiffio.h, below, includes <windows.h>, which | |
109 defines INT32 and INT16, the former differently and incompatibly from jmorecfg.h, | |
110 included by jpeglib.h. We can disable the stuff in jmorecfg.h by defining XMD_H | |
111 (clever, huh?); then we define these typedefs the way that <windows.h> wants them | |
112 (which is more correct, anyway; jmorecfg.h defines INT32 as `long'). */ | |
113 #define XMD_H | |
114 typedef signed int INT32; | |
115 typedef signed short INT16; | |
116 #endif | |
106 | 117 |
107 #include <jpeglib.h> | 118 #include <jpeglib.h> |
108 #include <jerror.h> | 119 #include <jerror.h> |
109 | 120 |
110 END_C_DECLS | 121 END_C_DECLS |
1113 | 1124 |
1114 static size_t | 1125 static size_t |
1115 tiff_memory_write (thandle_t UNUSED (data), tdata_t UNUSED (buf), | 1126 tiff_memory_write (thandle_t UNUSED (data), tdata_t UNUSED (buf), |
1116 tsize_t UNUSED (size)) | 1127 tsize_t UNUSED (size)) |
1117 { | 1128 { |
1118 abort(); | 1129 ABORT(); |
1119 return 0; | 1130 return 0; |
1120 } | 1131 } |
1121 | 1132 |
1122 static toff_t | 1133 static toff_t |
1123 tiff_memory_seek (thandle_t data, toff_t off, int whence) | 1134 tiff_memory_seek (thandle_t data, toff_t off, int whence) |