[Guile-commits] 04/86: Refactor regarding internal detection of ia64

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit ea3c5cf9099741869043c56bc57f48c46976dc79
Author: Andy Wingo <address@hidden>
Date:   Sun Jun 17 19:16:14 2018 +0200

    Refactor regarding internal detection of ia64
    
    * libguile/_scm.h: Remove hack to define __ia64__.
    * libguile/continuations.c (capture_auxiliary_stack): Use __ia64 or
      __ia64__ to detect itanium.
---
 libguile/_scm.h          | 4 ----
 libguile/continuations.c | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libguile/_scm.h b/libguile/_scm.h
index a6ca151..87ae34b 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -32,10 +32,6 @@
  and differences between _scm.h and __scm.h.
  **********************************************************************/
 
-#if defined(__ia64) && !defined(__ia64__)
-# define __ia64__
-#endif
-
 #if HAVE_CONFIG_H
 #  include <config.h>
 #endif
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 84cd2ee..6cf483f 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -120,7 +120,7 @@ static void
 capture_auxiliary_stack (scm_i_thread *thread, scm_t_contregs *continuation)
 {
 #if SCM_HAVE_AUXILIARY_STACK
-# ifndef __ia64__
+# if !(defined __ia64 or defined __ia64__)
 # error missing auxiliary stack implementation for architecture
 # endif
   char *top;