Import Upstream version 5b3upstream/5b3

1 files changed, 18 insertions, 15 deletions

diff --git a/continue.h b/continue.h
index 3309172..3c213e0 100644
--- a/continue.h
+++ b/continue.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,30 +42,33 @@
 /* "continue.h" Scheme Continuations for C.
    Author: Aubrey Jaffer. */
 
-#ifdef vms
+#ifdef vax
 # ifndef CHEAP_CONTINUATIONS
 
-   typedef int jmp_buf[17];
-   extern int setjump(jmp_buf env);
-   extern int longjump(jmp_buf env, int ret);
+   typedef int jump_buf[17];
+   extern int setjump(jump_buf env);
+   extern int longjump(jump_buf env, int ret);
 
-#  define setjmp setjump
-#  define longjmp longjump
 # else
 #  include <setjmp.h>
+#  define jump_buf jmp_buf
+#  define setjump setjmp
+#  define longjump longjmp
 # endif
-#else				/* ndef vms */
+#else				/* ndef vax */
 # ifdef _CRAY1
-    typedef int jmp_buf[112];
-    extern int setjump(jmp_buf env);
-    extern int longjump(jmp_buf env, int ret);
 
-#  define setjmp setjump
-#  define longjmp longjump
+    typedef int jump_buf[112];
+    extern int setjump(jump_buf env);
+    extern int longjump(jump_buf env, int ret);
+
 # else				/* ndef _CRAY1 */
 #  include <setjmp.h>
+#  define jump_buf jmp_buf
+#  define setjump setjmp
+#  define longjump longjmp
 # endif				/* ndef _CRAY1 */
-#endif				/* ndef vms */
+#endif				/* ndef vax */
 
 /* `other' is a CONTINUATION slot for miscellaneous data of type
    CONTINUATION_OTHER.  */
@@ -93,7 +96,7 @@ typedef short STACKITEM;
 typedef long STACKITEM;
 #endif
 
-struct Continuation {jmp_buf jmpbuf;
+struct Continuation {jump_buf jmpbuf;
 		     long thrwval;
 		     long length;
 		     STACKITEM *stkbse;