[svn:parrot] r49454 - in trunk: . config/auto config/auto/infnan include/parrot lib/Parrot/Configure/Step src

[plobsing at svn.parrot.org]

Author: plobsing
Date: Tue Oct  5 23:38:50 2010
New Revision: 49454
URL: https://trac.parrot.org/parrot/changeset/49454

Log:
revert commits r49425, r49427, r49428, r49430, and r49431 as discussed on #ps

these commits cause test failures on darwin/ppc/g++

Deleted:
   trunk/config/auto/infnan/
   trunk/config/auto/infnan.pm
Modified:
   trunk/MANIFEST
   trunk/include/parrot/datatypes.h
   trunk/lib/Parrot/Configure/Step/List.pm
   trunk/src/datatypes.c

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	Tue Oct  5 23:33:05 2010	(r49453)
+++ trunk/MANIFEST	Tue Oct  5 23:38:50 2010	(r49454)
@@ -208,8 +208,6 @@
 config/auto/headers.pm                                      []
 config/auto/headers/test_c.in                               []
 config/auto/icu.pm                                          []
-config/auto/infnan.pm                                       []
-config/auto/infnan/test_c.in                                []
 config/auto/inline.pm                                       []
 config/auto/inline/test1_c.in                               []
 config/auto/inline/test2_c.in                               []

Deleted: trunk/config/auto/infnan.pm
==============================================================================
--- trunk/config/auto/infnan.pm	Tue Oct  5 23:38:50 2010	(r49453)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,66 +0,0 @@
-# Copyright (C) 2010, Parrot Foundation.
-# $Id$
-
-=head1 NAME
-
-config/auto/infnan.pm - detect INFINITY and NAN
-
-=head1 DESCRIPTION
-
-Determining if the system has INFINITY and NAN defined in headers.
-
-=cut
-
-package auto::infnan;
-
-use strict;
-use warnings;
-
-use base qw(Parrot::Configure::Step);
-
-use Parrot::Configure::Utils ':auto';
-
-sub _init {
-    my $self = shift;
-    my %data;
-    $data{description} = q{Are INFINITY and NAN defined};
-    $data{result}      = q{};
-    return \%data;
-}
-
-sub runstep {
-    my ( $self, $conf ) = @_;
-
-    my $infnan = 0;
-
-    $conf->cc_gen('config/auto/infnan/test_c.in');
-    eval { $conf->cc_build(); };
-    if (!$@) {
-        my $output = eval { $conf->cc_run() };
-        if (!$@ && $output =~ /OK/) {
-            $infnan = 1;
-        }
-    }
-    $conf->cc_clean();
-
-    if ($infnan) {
-        $conf->data->set( HAS_INF_NAN => 1 );
-        $self->set_result('yes');
-    }
-    else {
-        $conf->data->set( HAS_INF_NAN => 0 );
-        $self->set_result('no');
-    }
-
-    return 1;
-}
-
-1;
-
-# Local Variables:
-#   mode: cperl
-#   cperl-indent-level: 4
-#   fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
-

Modified: trunk/include/parrot/datatypes.h
==============================================================================
--- trunk/include/parrot/datatypes.h	Tue Oct  5 23:33:05 2010	(r49453)
+++ trunk/include/parrot/datatypes.h	Tue Oct  5 23:38:50 2010	(r49454)
@@ -15,8 +15,6 @@
 #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 */
@@ -125,7 +123,7 @@
 };
 #endif /* INSIDE_GLOBAL_SETUP */
 
-#ifdef PARROT_HAS_INF_NAN
+#if defined(__NetBSD__) && defined(__alpha__)
 #  include <math.h>
 #  define PARROT_FLOATVAL_INF_POSITIVE	INFINITY
 #  define PARROT_FLOATVAL_INF_NEGATIVE	-INFINITY

Modified: trunk/lib/Parrot/Configure/Step/List.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step/List.pm	Tue Oct  5 23:33:05 2010	(r49453)
+++ trunk/lib/Parrot/Configure/Step/List.pm	Tue Oct  5 23:38:50 2010	(r49454)
@@ -49,7 +49,6 @@
     auto::neg_0
     auto::env
     auto::timespec
-    auto::infnan
     auto::thread
     auto::gmp
     auto::readline

Modified: trunk/src/datatypes.c
==============================================================================
--- trunk/src/datatypes.c	Tue Oct  5 23:33:05 2010	(r49453)
+++ trunk/src/datatypes.c	Tue Oct  5 23:38:50 2010	(r49454)
@@ -93,8 +93,6 @@
 
 */
 
-#ifndef PARROT_HAS_INF_NAN
-
 PARROT_EXPORT
 FLOATVAL
 floatval_divide_by_zero(SHIM_INTERP, FLOATVAL num)
@@ -104,8 +102,6 @@
     return num / zero;
 }
 
-#endif
-
 
 /*