Mercurial > hg > xemacs-beta
comparison src/glyphs-x.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 | ab71ad6ff3dd |
children | 4eb2a8c07cb3 |
comparison
equal
deleted
inserted
replaced
2499:4c5ee4d2e921 | 2500:3d8143fc88e1 |
---|---|
1035 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) : 0); | 1035 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) : 0); |
1036 } | 1036 } |
1037 break; | 1037 break; |
1038 | 1038 |
1039 default: | 1039 default: |
1040 abort (); | 1040 ABORT (); |
1041 } | 1041 } |
1042 } | 1042 } |
1043 | 1043 |
1044 static void | 1044 static void |
1045 xbm_instantiate_1 (Lisp_Object image_instance, Lisp_Object instantiator, | 1045 xbm_instantiate_1 (Lisp_Object image_instance, Lisp_Object instantiator, |
1162 Lisp_Object cons = XCAR (results); | 1162 Lisp_Object cons = XCAR (results); |
1163 color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (XCDR (cons))); | 1163 color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (XCDR (cons))); |
1164 /* Duplicate the pixel value so that we still have a lock on it if | 1164 /* Duplicate the pixel value so that we still have a lock on it if |
1165 the pixel we were passed is later freed. */ | 1165 the pixel we were passed is later freed. */ |
1166 if (! XAllocColor (dpy, cmap, &color)) | 1166 if (! XAllocColor (dpy, cmap, &color)) |
1167 abort (); /* it must be allocable since we're just duplicating it */ | 1167 ABORT (); /* it must be allocable since we're just duplicating it */ |
1168 | 1168 |
1169 TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (cons), C_STRING_MALLOC, | 1169 TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (cons), C_STRING_MALLOC, |
1170 symbols[i].name, Qctext); | 1170 symbols[i].name, Qctext); |
1171 symbols[i].pixel = color.pixel; | 1171 symbols[i].pixel = color.pixel; |
1172 symbols[i].value = 0; | 1172 symbols[i].value = 0; |
1522 } | 1522 } |
1523 | 1523 |
1524 break; | 1524 break; |
1525 | 1525 |
1526 default: | 1526 default: |
1527 abort (); | 1527 ABORT (); |
1528 } | 1528 } |
1529 | 1529 |
1530 xpm_free (&xpmattrs); /* after we've read pixels and hotspot */ | 1530 xpm_free (&xpmattrs); /* after we've read pixels and hotspot */ |
1531 } | 1531 } |
1532 | 1532 |