From 36e6bc645e5e49571fc2e5626a3f357f2da98cd5 Mon Sep 17 00:00:00 2001
From: kleink <kleink@NetBSD.org>
Date: Sat, 5 Feb 2000 14:04:36 +0000
Subject: [PATCH] Improve namespace test macros a bit.

---
 sys/arch/alpha/include/math.h   | 7 ++++---
 sys/arch/arm32/include/math.h   | 7 ++++---
 sys/arch/i386/include/math.h    | 7 ++++---
 sys/arch/m68k/include/math.h    | 7 ++++---
 sys/arch/mips/include/math.h    | 7 ++++---
 sys/arch/powerpc/include/math.h | 7 ++++---
 sys/arch/sh3/include/math.h     | 7 ++++---
 sys/arch/sparc/include/math.h   | 7 ++++---
 sys/arch/sparc64/include/math.h | 7 ++++---
 9 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/sys/arch/alpha/include/math.h b/sys/arch/alpha/include/math.h
index e1ba3d151bb1..bcfd98b45270 100644
--- a/sys/arch/alpha/include/math.h
+++ b/sys/arch/alpha/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:07 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:36 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/arm32/include/math.h b/sys/arch/arm32/include/math.h
index 97630b6f4b44..d26e768a4b09 100644
--- a/sys/arch/arm32/include/math.h
+++ b/sys/arch/arm32/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:09 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:37 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/i386/include/math.h b/sys/arch/i386/include/math.h
index d26a01f6f917..d26e768a4b09 100644
--- a/sys/arch/i386/include/math.h
+++ b/sys/arch/i386/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:11 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:37 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/m68k/include/math.h b/sys/arch/m68k/include/math.h
index ad66eec8599f..751bf58234a4 100644
--- a/sys/arch/m68k/include/math.h
+++ b/sys/arch/m68k/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:12 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:38 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/mips/include/math.h b/sys/arch/mips/include/math.h
index 82ea5558c2ac..44130f951e80 100644
--- a/sys/arch/mips/include/math.h
+++ b/sys/arch/mips/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:13 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:39 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/powerpc/include/math.h b/sys/arch/powerpc/include/math.h
index 84fb887ae880..1befe269c2a3 100644
--- a/sys/arch/powerpc/include/math.h
+++ b/sys/arch/powerpc/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:14 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:40 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/sh3/include/math.h b/sys/arch/sh3/include/math.h
index 08a268b4451c..c62b84878673 100644
--- a/sys/arch/sh3/include/math.h
+++ b/sys/arch/sh3/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.1 2000/01/17 16:27:53 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.2 2000/02/05 14:04:40 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/sparc/include/math.h b/sys/arch/sparc/include/math.h
index 2bc6f7da9298..43a4756ddfcc 100644
--- a/sys/arch/sparc/include/math.h
+++ b/sys/arch/sparc/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:15 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:41 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif
diff --git a/sys/arch/sparc64/include/math.h b/sys/arch/sparc64/include/math.h
index 2bc6f7da9298..43a4756ddfcc 100644
--- a/sys/arch/sparc64/include/math.h
+++ b/sys/arch/sparc64/include/math.h
@@ -1,10 +1,11 @@
-/*	$NetBSD: math.h,v 1.2 2000/01/04 14:20:15 kleink Exp $	*/
+/*	$NetBSD: math.h,v 1.3 2000/02/05 14:04:41 kleink Exp $	*/
 
 /*
  * ISO C99
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || defined(_ISOC99_SOURCE)
+#if !defined(_ANSI_SOURCE) && \
+    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
+     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
 extern __const char	__nanf[];
 #define	NAN		(*(__const float *)(__const void *)__nanf)
 #endif