[Guile-commits] GNU Guile branch, branch_release-1-8, updated. release_1-8-7-20-gaac41d2

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=aac41d28358cea594bb30f6e547afb82bb6004a6

The branch, branch_release-1-8 has been updated
       via  aac41d28358cea594bb30f6e547afb82bb6004a6 (commit)
       via  2462fad237296ee97d7b66f2854c35bb133ccaf2 (commit)
      from  899a17a78389880e041c4ac5a54c099b4a8adc17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aac41d28358cea594bb30f6e547afb82bb6004a6
Author: Andy Wingo <address@hidden>
Date:   Sun Jan 17 18:22:51 2010 +0100

    fix doc snarfing with fedora 12
    
    * module/scripts/snarf-check-and-output-texi.scm
      (process-multiline-directive): Be more accepting of source location
      markers in the preprocessed source, by adding a couple cases in which
      they can appear. Not foolproof, but it does adapt to what new GCCs are
      putting out (e.g. cpp (GCC) 4.4.2 20091222 (Red Hat 4.4.2-20)).

commit 2462fad237296ee97d7b66f2854c35bb133ccaf2
Author: Andy Wingo <address@hidden>
Date:   Thu Jun 10 14:34:51 2010 +0200

    avoid type-punning errors in guile_ieee_init on OSF
    
    * libguile/numbers.c (guile_ieee_init): Avoid type-punning errors on
      OSF. Thanks to Jay Krell for the report.

-----------------------------------------------------------------------

Summary of changes:
 libguile/numbers.c                  |   20 +++++++++++++++++---
 scripts/snarf-check-and-output-texi |   11 +++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/libguile/numbers.c b/libguile/numbers.c
index 9190876..bd80626 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 
2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 
2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  *
  * Portions Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories
  * and Bellcore.  See scm_divide.
@@ -620,7 +620,14 @@ guile_ieee_init (void)
 #elif HAVE_DINFINITY
   /* OSF */
   extern unsigned int DINFINITY[2];
-  guile_Inf = (*((double *) (DINFINITY)));
+  union
+  {
+    double d;
+    int i[2];
+  } alias;
+  alias.i[0] = DINFINITY[0];
+  alias.i[1] = DINFINITY[1];
+  guile_Inf = alias.d;
 #else
   double tmp = 1e+10;
   guile_Inf = tmp;
@@ -651,7 +658,14 @@ guile_ieee_init (void)
   {
     /* OSF */
     extern unsigned int DQNAN[2];
-    guile_NaN = (*((double *)(DQNAN)));
+    union
+    {
+      double d;
+      int i[2];
+    } alias;
+    alias.i[0] = DQNAN[0];
+    alias.i[1] = DQNAN[1];
+    guile_NaN = alias.d;
   }
 #else
   guile_NaN = guile_Inf / guile_Inf;
diff --git a/scripts/snarf-check-and-output-texi 
b/scripts/snarf-check-and-output-texi
index ea33e17..8cd42e8 100755
--- a/scripts/snarf-check-and-output-texi
+++ b/scripts/snarf-check-and-output-texi
@@ -267,6 +267,17 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr 
(command-line)))" "$@"
       (set! *file* file)
       (set! *line* line))
 
+     ;; newer gccs like to throw around more location markers into the
+     ;; preprocessed source; these (hash . hash) bits are what they translate 
to
+     ;; in snarfy terms.
+     (('location ('string . file) ('int . line) ('hash . 'hash))
+      (set! *file* file)
+      (set! *line* line))
+
+     (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 
'hash))
+      (set! *file* file)
+      (set! *line* line))
+
      (('arglist rest ...)
       (set! *args* (do-arglist rest)))
 


hooks/post-receive
-- 
GNU Guile