[Guile-commits] 08/11: Remove #ifdef cases for VMS and Cray.

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 418a7d7af935524f87a940545a747066f1fd6b1e
Author: Andy Wingo <address@hidden>
Date:   Sun Jun 17 10:01:22 2018 +0200

    Remove #ifdef cases for VMS and Cray.
    
    * libguile/__scm.h:
    * libguile/_scm.h:
    * libguile/feature.c (scm_init_feature): Remove VMS and Cray cases.
---
 libguile/__scm.h   | 12 +++---------
 libguile/_scm.h    | 16 +---------------
 libguile/feature.c |  7 ++-----
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/libguile/__scm.h b/libguile/__scm.h
index 62ceeeb..06e2e4e 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -3,8 +3,8 @@
 #ifndef SCM___SCM_H
 #define SCM___SCM_H
 
-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2006,
- *   2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2003,2006-2013,2018
+ *   Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -422,13 +422,7 @@ typedef struct scm_dynamic_state scm_t_dynamic_state;
  * _scm.h private header.
  */
 
-#if defined (vms)
-typedef int scm_i_jmp_buf[17];
-
-#elif defined (_CRAY1)
-typedef int scm_i_jmp_buf[112];
-
-#elif defined (__ia64__)
+#if defined (__ia64__)
 # include <signal.h>
 # include <ucontext.h>
 typedef struct {
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 60f5d5c..0aac316 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -158,21 +158,7 @@
 
 
 
-#if defined (vms)
-/* VMS: Implement SCM_I_SETJMP in terms of setjump.  */
-extern int setjump(scm_i_jmp_buf env);
-extern int longjump(scm_i_jmp_buf env, int ret);
-#define SCM_I_SETJMP setjump
-#define SCM_I_LONGJMP longjump
-
-#elif defined (_CRAY1)
-/* Cray: Implement SCM_I_SETJMP in terms of setjump.  */
-extern int setjump(scm_i_jmp_buf env);
-extern int longjump(scm_i_jmp_buf env, int ret);
-#define SCM_I_SETJMP setjump
-#define SCM_I_LONGJMP longjump
-
-#elif defined (__ia64__)
+#if defined (__ia64__)
 /* IA64: Implement SCM_I_SETJMP in terms of getcontext. */
 # define SCM_I_SETJMP(JB)                              \
   ( (JB).fresh = 1,                                    \
diff --git a/libguile/feature.c b/libguile/feature.c
index 114d875..65fcaea 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- *   2006, 2007, 2009, 2011, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2004,2006-2007,2009,2011,2013,2018
+ *   Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -106,9 +106,6 @@ scm_init_feature()
 #ifndef _Windows
   scm_add_feature("system");
 #endif
-#ifdef vms
-  scm_add_feature(s_ed);
-#endif
 #ifndef GO32
   scm_add_feature("char-ready?");
 #endif