comparison src/EmacsShell-sub.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 8c5cf108f035
children 374186f156d5
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
87 #include <X11/Shell.h> 87 #include <X11/Shell.h>
88 #include <X11/ShellP.h> 88 #include <X11/ShellP.h>
89 #include <X11/Vendor.h> 89 #include <X11/Vendor.h>
90 #include <X11/VendorP.h> 90 #include <X11/VendorP.h>
91 #include "EmacsShellP.h" 91 #include "EmacsShellP.h"
92
93 #define ABORT abort
92 94
93 #if defined (DEFINE_TOP_LEVEL_EMACS_SHELL) 95 #if defined (DEFINE_TOP_LEVEL_EMACS_SHELL)
94 #define EMACS_SHELL_WIDGET TopLevelEmacsShellWidget 96 #define EMACS_SHELL_WIDGET TopLevelEmacsShellWidget
95 #define SUPERCLASS_WIDGET_CLASS topLevelShellWidgetClass 97 #define SUPERCLASS_WIDGET_CLASS topLevelShellWidgetClass
96 #define SUPERCLASS_CLASS_REC topLevelShellClassRec 98 #define SUPERCLASS_CLASS_REC topLevelShellClassRec
284 if (gcer->record_type == NULLQUARK) 286 if (gcer->record_type == NULLQUARK)
285 break; 287 break;
286 } 288 }
287 289
288 if (!gcer) 290 if (!gcer)
289 abort (); 291 ABORT ();
290 292
291 /* call it to actually make the geometry request */ 293 /* call it to actually make the geometry request */
292 scer = (ShellClassExtensionRec *) gcer; 294 scer = (ShellClassExtensionRec *) gcer;
293 return (scer->root_geometry_manager)(gw, request, reply); 295 return (scer->root_geometry_manager)(gw, request, reply);
294 } 296 }
302 /* OK since this file is not dumped */ 304 /* OK since this file is not dumped */
303 static int reentrant = 0; 305 static int reentrant = 0;
304 XtGeometryResult result; 306 XtGeometryResult result;
305 307
306 if (reentrant) 308 if (reentrant)
307 abort (); 309 ABORT ();
308 reentrant++; 310 reentrant++;
309 311
310 #ifdef DEBUG_GEOMETRY_MANAGEMENT 312 #ifdef DEBUG_GEOMETRY_MANAGEMENT
311 printf ("root_geometry_manager:\n"); 313 printf ("root_geometry_manager:\n");
312 printf (" current shell size: %d %d\n", w->core.width, w->core.height); 314 printf (" current shell size: %d %d\n", w->core.width, w->core.height);