[nasm:nasm-2.15.xx] BR 3392648: rename float.[ch] to floats.[ch]

[nasm-bot for H. Peter Anvin (Intel)]

Commit-ID:  6e9554f0677752fd41674a0e20623d83b381d6da
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=6e9554f0677752fd41674a0e20623d83b381d6da
Author:     H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Sun, 14 Jun 2020 23:21:44 -0700
Committer:  H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Sun, 14 Jun 2020 23:24:43 -0700

BR 3392648: rename float.[ch] to floats.[ch]

Haiku apparently wants to include <float.h> rather than
"float.h". Rename float.[ch] to floats.[ch] to avoid unnecessary
namespace confusion.

Reported-by: <alaviss0+nasm at gmail.com>
Signed-off-by: H. Peter Anvin (Intel) <hpa at zytor.com>


---
 Makefile.in               |  2 +-
 Mkfiles/msvc.mak          |  2 +-
 Mkfiles/openwcom.mak      |  2 +-
 asm/directiv.c            |  2 +-
 asm/eval.c                |  2 +-
 asm/{float.c => floats.c} |  2 +-
 asm/{float.h => floats.h} | 10 +++++-----
 asm/nasm.c                |  2 +-
 asm/parser.c              |  2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index dbf8c6e3..dd4bf09f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,7 +123,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	x86/disp8.$(O) x86/iflag.$(O) \
 	\
 	asm/error.$(O) asm/warnings.$(O) \
-	asm/float.$(O) \
+	asm/floats.$(O) \
 	asm/directiv.$(O) asm/directbl.$(O) \
 	asm/pragma.$(O) \
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 09bb42fe..f004e984 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -87,7 +87,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
 	x86\disp8.$(O) x86\iflag.$(O) \
 	\
 	asm\error.$(O) asm\warnings.$(O) \
-	asm\float.$(O) \
+	asm\floats.$(O) \
 	asm\directiv.$(O) asm\directbl.$(O) \
 	asm\pragma.$(O) \
 	asm\assemble.$(O) asm\labels.$(O) asm\parser.$(O) \
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index d13b780f..82ce05ac 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -76,7 +76,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
 	x86\disp8.$(O) x86\iflag.$(O) &
 	&
 	asm\error.$(O) asm\warnings.$(O) &
-	asm\float.$(O) &
+	asm\floats.$(O) &
 	asm\directiv.$(O) asm\directbl.$(O) &
 	asm\pragma.$(O) &
 	asm\assemble.$(O) asm\labels.$(O) asm\parser.$(O) &
diff --git a/asm/directiv.c b/asm/directiv.c
index 96464d62..53422098 100644
--- a/asm/directiv.c
+++ b/asm/directiv.c
@@ -43,7 +43,7 @@
 #include "nasmlib.h"
 #include "ilog2.h"
 #include "error.h"
-#include "float.h"
+#include "floats.h"
 #include "stdscan.h"
 #include "preproc.h"
 #include "eval.h"
diff --git a/asm/eval.c b/asm/eval.c
index 0dd7e61a..cd3c526d 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -45,7 +45,7 @@
 #include "error.h"
 #include "eval.h"
 #include "labels.h"
-#include "float.h"
+#include "floats.h"
 #include "assemble.h"
 
 #define TEMPEXPRS_DELTA 128
diff --git a/asm/float.c b/asm/floats.c
similarity index 99%
rename from asm/float.c
rename to asm/floats.c
index 77d576c6..adc6afbf 100644
--- a/asm/float.c
+++ b/asm/floats.c
@@ -40,7 +40,7 @@
 #include "nctype.h"
 
 #include "nasm.h"
-#include "float.h"
+#include "floats.h"
 #include "error.h"
 
 /*
diff --git a/asm/float.h b/asm/floats.h
similarity index 92%
rename from asm/float.h
rename to asm/floats.h
index b07e542a..4f80acac 100644
--- a/asm/float.h
+++ b/asm/floats.h
@@ -32,12 +32,12 @@
  * ----------------------------------------------------------------------- */
 
 /* 
- * float.h   header file for the floating-point constant module of
- *	     the Netwide Assembler
+ * floats.h   header file for the floating-point constant module of
+ *	      the Netwide Assembler
  */
 
-#ifndef NASM_FLOAT_H
-#define NASM_FLOAT_H
+#ifndef NASM_FLOATS_H
+#define NASM_FLOATS_H
 
 #include "nasm.h"
 
@@ -51,4 +51,4 @@ enum float_round {
 int float_const(const char *string, int sign, uint8_t *result, int bytes);
 int float_option(const char *option);
 
-#endif
+#endif /* NASM_FLOATS_H */
diff --git a/asm/nasm.c b/asm/nasm.c
index 333ba70c..7c64569f 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -44,7 +44,7 @@
 #include "error.h"
 #include "saa.h"
 #include "raa.h"
-#include "float.h"
+#include "floats.h"
 #include "stdscan.h"
 #include "insns.h"
 #include "preproc.h"
diff --git a/asm/parser.c b/asm/parser.c
index a59acb19..de24103e 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -46,7 +46,7 @@
 #include "stdscan.h"
 #include "eval.h"
 #include "parser.h"
-#include "float.h"
+#include "floats.h"
 #include "assemble.h"
 #include "tables.h"