Hi Bruno. Thanks for your comments. I broke up the monolithic
patch into four smaller patches as you requested. I'm sending
them in four separate emails as is common on some mailing lists
(although I haven't seen that much here).
Here's the first part.
commit 7c48a2763095735921e2ad9889b4300492ee8044
Author: Ben Pfaff <[EMAIL PROTECTED]>
Date: Thu Jul 10 21:38:42 2008 -0700
Rename isnand.h to isnand-nolibm.h, similarly for isnanf.h.
diff --git a/ChangeLog b/ChangeLog
index 6c5f522..5897695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2008-07-10 Ben Pfaff <[EMAIL PROTECTED]>
+
+ * lib/isnanf.h: Rename lib/isnanf-nolibm.h.
+ * lib/isnand.h: Rename lib/isnand-nolibm.h.
+ * tests/test-isnanf.c: Rename tests/test-isnanf-nolibm.c.
+ * tests/test-isnand.c: Rename tests/test-isnand-nolibm.c.
+ * modules/isnanf-nolibm: Update references to renamed files.
+ * modules/isnand-nolibm: Likewise.
+ * modules/isnanf-nolibm-tests: Likewise.
+ * modules/isnand-nolibm-tests: Likewise.
+ * lib/frexp.c: Likewise.
+ * lib/isfinite.c: Likewise.
+ * lib/signbitd.c: Likewise.
+ * lib/signbitf.c: Likewise.
+ * lib/vasnprintf.c: Likewise.
+ * tests/test-ceilf1.c: Likewise.
+ * tests/test-ceilf2.c: Likewise.
+ * tests/test-floorf1.c: Likewise.
+ * tests/test-floorf2.c: Likewise.
+ * tests/test-frexp.c: Likewise.
+ * tests/test-round1.c: Likewise.
+ * tests/test-round2.c: Likewise.
+ * tests/test-roundf1.c: Likewise.
+ * tests/test-strtod.c: Likewise.
+ * tests/test-trunc1.c: Likewise.
+ * tests/test-trunc2.c: Likewise.
+ * tests/test-truncf1.c: Likewise.
+ * tests/test-truncf2.c: Likewise.
+ * NEWS: Mention the renamed header files.
+
2008-07-04 Jim Meyering <[EMAIL PROTECTED]>
* users.txt: Add vc-dwim.
diff --git a/NEWS b/NEWS
index 75735e5..74ca234 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ User visible incompatible changes
Date Modules Changes
+2008-07-07 isnanf-nolibm The include file is changed from "isnanf.h"
+ to "isnanf-nolibm.h".
+ isnand-nolibm The include file is changed from "isnand.h"
+ to "isnand-nolibm.h".
+
2008-06-10 execute The execute function takes an additional termsigp
argument. Passing termsigp = NULL is ok.
wait-process The wait_subprocess function takes an additional
diff --git a/lib/frexp.c b/lib/frexp.c
index 4fd0819..7e1f5d1 100644
--- a/lib/frexp.c
+++ b/lib/frexp.c
@@ -27,7 +27,7 @@
# include "isnanl-nolibm.h"
# include "fpucw.h"
#else
-# include "isnand.h"
+# include "isnand-nolibm.h"
#endif
/* This file assumes FLT_RADIX = 2. If FLT_RADIX is a power of 2 greater
diff --git a/lib/isfinite.c b/lib/isfinite.c
index e648929..b7baff4 100644
--- a/lib/isfinite.c
+++ b/lib/isfinite.c
@@ -19,8 +19,8 @@
#include <config.h>
-#include "isnanf.h"
-#include "isnand.h"
+#include "isnanf-nolibm.h"
+#include "isnand-nolibm.h"
#include "isnanl-nolibm.h"
int gl_isfinitef (float x)
diff --git a/lib/isnand.h b/lib/isnand-nolibm.h
similarity index 100%
rename from lib/isnand.h
rename to lib/isnand-nolibm.h
diff --git a/lib/isnanf.h b/lib/isnanf-nolibm.h
similarity index 100%
rename from lib/isnanf.h
rename to lib/isnanf-nolibm.h
diff --git a/lib/signbitd.c b/lib/signbitd.c
index 8871de7..9a7d725 100644
--- a/lib/signbitd.c
+++ b/lib/signbitd.c
@@ -20,7 +20,7 @@
#include <math.h>
#include <string.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#include "float+.h"
#undef gl_signbitd
diff --git a/lib/signbitf.c b/lib/signbitf.c
index 8b0f93c..d03fcdd 100644
--- a/lib/signbitf.c
+++ b/lib/signbitf.c
@@ -20,7 +20,7 @@
#include <math.h>
#include <string.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#include "float+.h"
#undef gl_signbitf
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 472ce23..89829c9 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -95,7 +95,7 @@
#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL
# include <math.h>
-# include "isnand.h"
+# include "isnand-nolibm.h"
#endif
#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined
IN_LIBINTL
@@ -106,7 +106,7 @@
#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
# include <math.h>
-# include "isnand.h"
+# include "isnand-nolibm.h"
# include "printf-frexp.h"
#endif
diff --git a/modules/isnand-nolibm b/modules/isnand-nolibm
index 6bb8c7d..3fd1ee9 100644
--- a/modules/isnand-nolibm
+++ b/modules/isnand-nolibm
@@ -2,7 +2,7 @@ Description:
isnand() function: test for NaN, without requiring libm.
Files:
-lib/isnand.h
+lib/isnand-nolibm.h
lib/isnand.c
lib/isnan.c
lib/float+.h
@@ -17,7 +17,7 @@ gl_FUNC_ISNAND_NO_LIBM
Makefile.am:
Include:
-#include "isnand.h"
+#include "isnand-nolibm.h"
License:
LGPL
diff --git a/modules/isnand-nolibm-tests b/modules/isnand-nolibm-tests
index 7fd37ba..2283fba 100644
--- a/modules/isnand-nolibm-tests
+++ b/modules/isnand-nolibm-tests
@@ -1,5 +1,5 @@
Files:
-tests/test-isnand.c
+tests/test-isnand-nolibm.c
tests/nan.h
Depends-on:
@@ -8,6 +8,6 @@ configure.ac:
gl_DOUBLE_EXPONENT_LOCATION
Makefile.am:
-TESTS += test-isnand
-check_PROGRAMS += test-isnand
+TESTS += test-isnand-nolibm
+check_PROGRAMS += test-isnand-nolibm
diff --git a/modules/isnanf-nolibm b/modules/isnanf-nolibm
index 3f90629..e6418b0 100644
--- a/modules/isnanf-nolibm
+++ b/modules/isnanf-nolibm
@@ -2,7 +2,7 @@ Description:
isnanf() function: test for NaN, without requiring libm.
Files:
-lib/isnanf.h
+lib/isnanf-nolibm.h
lib/isnanf.c
lib/isnan.c
lib/float+.h
@@ -17,7 +17,7 @@ gl_FUNC_ISNANF_NO_LIBM
Makefile.am:
Include:
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
License:
LGPL
diff --git a/modules/isnanf-nolibm-tests b/modules/isnanf-nolibm-tests
index 8225ff4..9fba72b 100644
--- a/modules/isnanf-nolibm-tests
+++ b/modules/isnanf-nolibm-tests
@@ -1,5 +1,5 @@
Files:
-tests/test-isnanf.c
+tests/test-isnanf-nolibm.c
tests/nan.h
Depends-on:
@@ -8,6 +8,6 @@ configure.ac:
gl_FLOAT_EXPONENT_LOCATION
Makefile.am:
-TESTS += test-isnanf
-check_PROGRAMS += test-isnanf
+TESTS += test-isnanf-nolibm
+check_PROGRAMS += test-isnanf-nolibm
diff --git a/tests/test-ceilf1.c b/tests/test-ceilf1.c
index 430e4ab..f17c19a 100644
--- a/tests/test-ceilf1.c
+++ b/tests/test-ceilf1.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#include "nan.h"
#define ASSERT(expr) \
diff --git a/tests/test-ceilf2.c b/tests/test-ceilf2.c
index e6d69ec..17aac84 100644
--- a/tests/test-ceilf2.c
+++ b/tests/test-ceilf2.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#define ASSERT(expr) \
do \
diff --git a/tests/test-floorf1.c b/tests/test-floorf1.c
index 773e4bc..b9c4da4 100644
--- a/tests/test-floorf1.c
+++ b/tests/test-floorf1.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#include "nan.h"
#define ASSERT(expr) \
diff --git a/tests/test-floorf2.c b/tests/test-floorf2.c
index 1521c22..e7fcd98 100644
--- a/tests/test-floorf2.c
+++ b/tests/test-floorf2.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#define ASSERT(expr) \
do \
diff --git a/tests/test-frexp.c b/tests/test-frexp.c
index c08056c..5d95063 100644
--- a/tests/test-frexp.c
+++ b/tests/test-frexp.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#include "nan.h"
/* Avoid some warnings from "gcc -Wshadow".
diff --git a/tests/test-isnand.c b/tests/test-isnand-nolibm.c
similarity index 98%
rename from tests/test-isnand.c
rename to tests/test-isnand-nolibm.c
index d7b66c4..391871f 100644
--- a/tests/test-isnand.c
+++ b/tests/test-isnand-nolibm.c
@@ -18,7 +18,7 @@
#include <config.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#include <limits.h>
#include <stdio.h>
diff --git a/tests/test-isnanf.c b/tests/test-isnanf-nolibm.c
similarity index 98%
rename from tests/test-isnanf.c
rename to tests/test-isnanf-nolibm.c
index 00fbfeb..bbc042a 100644
--- a/tests/test-isnanf.c
+++ b/tests/test-isnanf-nolibm.c
@@ -18,7 +18,7 @@
#include <config.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#include <limits.h>
#include <stdio.h>
diff --git a/tests/test-round1.c b/tests/test-round1.c
index 2cf90f6..935eb10 100644
--- a/tests/test-round1.c
+++ b/tests/test-round1.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#include "nan.h"
#define ASSERT(expr) \
diff --git a/tests/test-round2.c b/tests/test-round2.c
index aa993ef..b5944a9 100644
--- a/tests/test-round2.c
+++ b/tests/test-round2.c
@@ -37,7 +37,7 @@
#ifdef USE_LONG_DOUBLE
# error Long double not supported.
#elif ! defined USE_FLOAT
-# include "isnand.h"
+# include "isnand-nolibm.h"
# define ISNAN isnand
# define FUNCTION "round"
# define DOUBLE_UINT uint64_t
@@ -45,7 +45,7 @@
# define NUM_HIGHBITS 13
# define NUM_LOWBITS 4
#else /* defined USE_FLOAT */
-# include "isnanf.h"
+# include "isnanf-nolibm.h"
# define ISNAN isnanf
# define FUNCTION "roundf"
# define DOUBLE_UINT uint32_t
diff --git a/tests/test-roundf1.c b/tests/test-roundf1.c
index 0b6bc2f..60e1946 100644
--- a/tests/test-roundf1.c
+++ b/tests/test-roundf1.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#include "nan.h"
#define ASSERT(expr) \
diff --git a/tests/test-strtod.c b/tests/test-strtod.c
index 12d3606..87d7062 100644
--- a/tests/test-strtod.c
+++ b/tests/test-strtod.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <string.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#define ASSERT(expr) \
do \
diff --git a/tests/test-trunc1.c b/tests/test-trunc1.c
index 0449aa9..ebe4482 100644
--- a/tests/test-trunc1.c
+++ b/tests/test-trunc1.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#include "nan.h"
#define ASSERT(expr) \
diff --git a/tests/test-trunc2.c b/tests/test-trunc2.c
index adf4e54..b13433f 100644
--- a/tests/test-trunc2.c
+++ b/tests/test-trunc2.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnand.h"
+#include "isnand-nolibm.h"
#define ASSERT(expr) \
do \
diff --git a/tests/test-truncf1.c b/tests/test-truncf1.c
index 16d8682..8d46840 100644
--- a/tests/test-truncf1.c
+++ b/tests/test-truncf1.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#include "nan.h"
#define ASSERT(expr) \
diff --git a/tests/test-truncf2.c b/tests/test-truncf2.c
index 0a73371..dd849ab 100644
--- a/tests/test-truncf2.c
+++ b/tests/test-truncf2.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "isnanf.h"
+#include "isnanf-nolibm.h"
#define ASSERT(expr) \
do \
--
I love deadlines.
I love the whooshing noise they make as they go by.
--Douglas Adams
