[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).

--- a/src/file-coding.c	Mon Jan 24 22:51:18 2005 +0000
+++ b/src/file-coding.c	Mon Jan 24 23:34:34 2005 +0000
@@ -730,7 +730,7 @@
 {
   switch (type)
     {
-    default: abort ();
+    default: ABORT ();
     case EOL_LF:         return Qlf;
     case EOL_CRLF:       return Qcrlf;
     case EOL_CR:         return Qcr;
@@ -1579,7 +1579,7 @@
     case EOL_LF:   new_coding_system = CODING_SYSTEM_EOL_LF   (cs); break;
     case EOL_CR:   new_coding_system = CODING_SYSTEM_EOL_CR   (cs); break;
     case EOL_CRLF: new_coding_system = CODING_SYSTEM_EOL_CRLF (cs); break;
-    default:       abort (); return Qnil;
+    default:       ABORT (); return Qnil;
     }
 
   return NILP (new_coding_system) ? coding_system : new_coding_system;
@@ -2679,7 +2679,7 @@
     case 3: return DECODES_CHARACTER_TO_CHARACTER;
     }
 
-  abort ();
+  ABORT ();
   return DECODES_BYTE_TO_BYTE;
 }
 
@@ -2836,7 +2836,7 @@
 		    data->subtype == EOL_CRLF ? "crlf" :
 		    data->subtype == EOL_CR ? "cr" :
 		    data->subtype == EOL_AUTODETECT ? "nil" :
-		    (abort(), ""));
+		    (ABORT(), ""));
 }
 
 static enum source_sink_type
@@ -2884,7 +2884,7 @@
 	case EOL_CRLF: return Qcrlf;
 	case EOL_CR: return Qcr;
 	case EOL_AUTODETECT: return Qnil;
-	default: abort ();
+	default: ABORT ();
 	}
     }
 
@@ -3036,7 +3036,7 @@
     case EOL_CRLF: return Fget_coding_system (Qconvert_eol_crlf);
     case EOL_CR: return Fget_coding_system (Qconvert_eol_cr);
     case EOL_AUTODETECT: return str->codesys;
-    default: abort (); return Qnil;
+    default: ABORT (); return Qnil;
     }
 }
 
@@ -3256,7 +3256,7 @@
 	  return Dynarr_at (cats, j).sym;
     }
 
-  abort ();
+  ABORT ();
   return Qnil; /* (usually) not reached */
 }
 
@@ -3277,7 +3277,7 @@
 #undef FROB
   }
 
-  abort ();
+  ABORT ();
   return Qnil; /* (usually) not reached */
 }