[svn:parrot] r49457 - in branches/infnan: . include/parrot lib/Parrot/Configure/Step src

[plobsing at svn.parrot.org]

Author: plobsing
Date: Tue Oct  5 23:45:36 2010
New Revision: 49457
URL: https://trac.parrot.org/parrot/changeset/49457

Log:
import commits r49425, r49427, r49428, r49430, and r49431 for further review and testing

Modified:
   branches/infnan/MANIFEST
   branches/infnan/include/parrot/datatypes.h
   branches/infnan/lib/Parrot/Configure/Step/List.pm
   branches/infnan/src/datatypes.c

Modified: branches/infnan/MANIFEST
==============================================================================
--- branches/infnan/MANIFEST	Tue Oct  5 23:41:25 2010	(r49456)
+++ branches/infnan/MANIFEST	Tue Oct  5 23:45:36 2010	(r49457)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Oct  4 20:12:34 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Oct  5 23:41:46 2010 UT
 #
 # See below for documentation on the format of this file.
 #

Modified: branches/infnan/include/parrot/datatypes.h
==============================================================================
--- branches/infnan/include/parrot/datatypes.h	Tue Oct  5 23:41:25 2010	(r49456)
+++ branches/infnan/include/parrot/datatypes.h	Tue Oct  5 23:45:36 2010	(r49457)
@@ -15,6 +15,8 @@
 #ifndef PARROT_DATATYPES_H_GUARD
 #define PARROT_DATATYPES_H_GUARD
 
+#include "parrot/has_header.h"
+
 /* &gen_from_enum(datatypes.pasm) subst(s/enum_type_(\w+)/uc("DATATYPE_$1")/e) */
 typedef enum {
     enum_type_undef,            /* illegal */
@@ -123,7 +125,7 @@
 };
 #endif /* INSIDE_GLOBAL_SETUP */
 
-#if defined(__NetBSD__) && defined(__alpha__)
+#ifdef PARROT_HAS_INF_NAN
 #  include <math.h>
 #  define PARROT_FLOATVAL_INF_POSITIVE	INFINITY
 #  define PARROT_FLOATVAL_INF_NEGATIVE	-INFINITY

Modified: branches/infnan/lib/Parrot/Configure/Step/List.pm
==============================================================================
--- branches/infnan/lib/Parrot/Configure/Step/List.pm	Tue Oct  5 23:41:25 2010	(r49456)
+++ branches/infnan/lib/Parrot/Configure/Step/List.pm	Tue Oct  5 23:45:36 2010	(r49457)
@@ -49,6 +49,7 @@
     auto::neg_0
     auto::env
     auto::timespec
+    auto::infnan
     auto::thread
     auto::gmp
     auto::readline

Modified: branches/infnan/src/datatypes.c
==============================================================================
--- branches/infnan/src/datatypes.c	Tue Oct  5 23:41:25 2010	(r49456)
+++ branches/infnan/src/datatypes.c	Tue Oct  5 23:45:36 2010	(r49457)
@@ -93,6 +93,8 @@
 
 */
 
+#ifndef PARROT_HAS_INF_NAN
+
 PARROT_EXPORT
 FLOATVAL
 floatval_divide_by_zero(SHIM_INTERP, FLOATVAL num)
@@ -102,6 +104,8 @@
     return num / zero;
 }
 
+#endif
+
 
 /*