diff options
author | Joseph Heenan <joseph@emobix.co.uk> | 2014-10-04 08:08:57 -0500 |
---|---|---|
committer | Joseph Heenan <joseph@emobix.co.uk> | 2014-10-04 08:11:35 -0500 |
commit | 39ee719d76c9c3522a0e51d2507f826bf9692a80 (patch) | |
tree | 55ab3a7276283e1a86deaa0059caf1dbf7c7c4be /source/fitz | |
parent | 9268b59ffcb5e5a276324d692c9d63c0e2f1e3ce (diff) | |
download | mupdf-39ee719d76c9c3522a0e51d2507f826bf9692a80.tar.xz |
Avoid redefinition warning from clang when building cmapdump.c
In file included from scripts/cmapdump.c:19:
scripts/../source/fitz/ftoa.c:30:23: warning: redefinition of typedef 'ulong' is a C11 feature [-Wtypedef-redefinition]
typedef unsigned long ulong;
^
scripts/../source/fitz/strtod.c:30:23: note: previous definition is here
typedef unsigned long ulong;
^
1 warning generated.
(Apparently in earlier versions of clang this is an error.)
Diffstat (limited to 'source/fitz')
-rw-r--r-- | source/fitz/ftoa.c | 3 | ||||
-rw-r--r-- | source/fitz/strtod.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/fitz/ftoa.c b/source/fitz/ftoa.c index dc3ce73b..47759425 100644 --- a/source/fitz/ftoa.c +++ b/source/fitz/ftoa.c @@ -27,7 +27,10 @@ #define NAN (INFINITY-INFINITY) #endif +#ifndef DEFINED_ULONG +#define DEFINED_ULONG typedef unsigned long ulong; +#endif enum { NSIGNIF = 9 }; diff --git a/source/fitz/strtod.c b/source/fitz/strtod.c index f548b6f3..7ab30fb2 100644 --- a/source/fitz/strtod.c +++ b/source/fitz/strtod.c @@ -27,7 +27,10 @@ #define NAN (INFINITY-INFINITY) #endif +#ifndef DEFINED_ULONG +#define DEFINED_ULONG typedef unsigned long ulong; +#endif static ulong umuldiv(ulong a, ulong b, ulong c) |