diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-14 23:21:44 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-14 23:24:43 -0700 |
| commit | 6e9554f0677752fd41674a0e20623d83b381d6da (patch) | |
| tree | 4748c26d63bda5c8b6a5ed280b55fdcd98850a2d | |
| parent | c4f95ca862d2e7e4f5fa9c055014e25a31ba9496 (diff) | |
| download | nasm-6e9554f0677752fd41674a0e20623d83b381d6da.tar.gz | |
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@gmail.com>
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Mkfiles/msvc.mak | 2 | ||||
| -rw-r--r-- | Mkfiles/openwcom.mak | 2 | ||||
| -rw-r--r-- | asm/directiv.c | 2 | ||||
| -rw-r--r-- | asm/eval.c | 2 | ||||
| -rw-r--r-- | asm/floats.c (renamed from asm/float.c) | 2 | ||||
| -rw-r--r-- | asm/floats.h (renamed from asm/float.h) | 10 | ||||
| -rw-r--r-- | asm/nasm.c | 2 | ||||
| -rw-r--r-- | 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" @@ -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 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 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 */ @@ -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" |