re PR c/13814 (rejects different prototypes than builtin function)

	PR c/13814
	* config/linker-map.gnu (nan): Delete.
	* libmath/mathconf.h (NAN, nan): Delete.
	* linkage.m4 (nan): Don't check for it.
	* libmath/nan.c: Delete file.

	* config.h.in, configure: Regenerate.

From-SVN: r76431

7 files changed, 19 insertions, 62 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c3947b38d6e..a2e6307aec1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR c/13814
+	* config/linker-map.gnu (nan): Delete.
+	* libmath/mathconf.h (NAN, nan): Delete.
+	* linkage.m4 (nan): Don't check for it.
+	* libmath/nan.c: Delete file.
+
+	* config.h.in, configure: Regenerate.
+
 2004-01-23  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/basic_string.h (push_back(_CharT)):
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index b2d030da06d..7d13cdab027 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -422,9 +422,6 @@
 /* Define to 1 if you have the `modfl' function. */
 #undef HAVE_MODFL
 
-/* Define to 1 if you have the `nan' function. */
-#undef HAVE_NAN
-
 /* Define to 1 if you have the <nan.h> header file. */
 #undef HAVE_NAN_H
 
diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu
index 2d46e884888..9dc4e9181b1 100644
--- a/libstdc++-v3/config/linker-map.gnu
+++ b/libstdc++-v3/config/linker-map.gnu
@@ -203,7 +203,6 @@ GLIBCXX_3.4 {
     sqrtf;
     sqrtl;
     copysignf;
-    nan;
     __signbit;
     __signbitf;
     __signbitl;
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index dde36f5e4a0..b4ef0e1997c 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -24177,8 +24177,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44201,8 +44200,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -47064,8 +47062,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49202,8 +49199,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -51213,8 +51209,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -53761,8 +53756,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55728,8 +55722,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57594,8 +57587,7 @@ _ACEOF
 fi
 
 
-
-for ac_func in nan copysignf
+for ac_func in copysignf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/libstdc++-v3/libmath/mathconf.h b/libstdc++-v3/libmath/mathconf.h
index 087631a5687..cd8c92ad89f 100644
--- a/libstdc++-v3/libmath/mathconf.h
+++ b/libstdc++-v3/libmath/mathconf.h
@@ -79,11 +79,6 @@ typedef int Int64_t __attribute ((mode (DI)));
 # include <nan.h>
 #endif
 
-#ifndef NAN
-# define NAN (nan())
-double nan (void);
-#endif
-
 #ifdef HAVE_IEEEFP_H
 # include <ieeefp.h>
 #endif
diff --git a/libstdc++-v3/libmath/nan.c b/libstdc++-v3/libmath/nan.c
deleted file mode 100644
index 1814b5dd941..00000000000
--- a/libstdc++-v3/libmath/nan.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Return quiet nan. */
-
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
-
-   This file is part of the GNU ISO C++ Library.  This library is free
-   software; you can redistribute it and/or modify it under the
-   terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this library; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.
-
-   As a special exception, you may use this file as part of a free software
-   library without restriction.  Specifically, if other files instantiate
-   templates or use macros or inline functions from this file, or you compile
-   this file and link it with other files to produce an executable, this
-   file does not by itself cause the resulting executable to be covered by
-   the GNU General Public License.  This exception does not however
-   invalidate any other reasons why the executable file might be covered by
-   the GNU General Public License.  */
-
-
-#include <stdlib.h>
-#include <string.h>
-
-double
-nan ()
-{ return strtod ("nan", NULL); }
diff --git a/libstdc++-v3/linkage.m4 b/libstdc++-v3/linkage.m4
index ae8b18f544c..621492dd304 100644
--- a/libstdc++-v3/linkage.m4
+++ b/libstdc++-v3/linkage.m4
@@ -510,7 +510,7 @@ AC_DEFUN(GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl always pass if libm is available, and fail if it isn't.  If it is
   dnl available, we assume we'll need it later, so add it to LIBS.
   AC_CHECK_LIB(m, main)
-  AC_REPLACE_MATHFUNCS(nan copysignf)
+  AC_REPLACE_MATHFUNCS(copysignf)
 
   dnl For __signbit to signbit conversions.
   AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"])