Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-03-12 09:29:36 +00:00
Code Issues Projects Releases Wiki Activity

Work around a preprocessor bug that was causing an inappropriate version of many of the xatonum functions to be included in every object file.

Browse Source
This commit is contained in:
Stephen Heumann 2014-12-02 18:57:45 -06:00
parent 52c59f6da1
commit 7b989fb6bc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/xatonum.h
View File

@ -81,8 +81,14 @@ narrow xato##N(const char *str) \
DECLARE_STR_CONV(long, l, ul) DECLARE_STR_CONV(long, l, ul)
/* Without the explicit !defined(__ORCAC__) check, ORCA/C's preprocessor was
* falsely treating the following #if as true. I think this occurs because
* the preprocessor state is somehow corrupted. The added check seems to work
* around the bug; hopefully the corruption doesn't cause any other problems.
*/
/* Same for int -> [long] long */ /* Same for int -> [long] long */
#if UINT_MAX == ULONG_MAX #if !defined(__ORCAC__) && UINT_MAX == ULONG_MAX
DEFINE_EQUIV_STR_CONV(int, i, l, u, ul) DEFINE_EQUIV_STR_CONV(int, i, l, u, ul)
#else #else
DECLARE_STR_CONV(int, i, u) DECLARE_STR_CONV(int, i, u)
@ -107,7 +113,7 @@ DECLARE_STR_CONV(int, i, u)
unsigned long bb_strtoul(const char *arg, char **endp, int base) FAST_FUNC; unsigned long bb_strtoul(const char *arg, char **endp, int base) FAST_FUNC;
long bb_strtol(const char *arg, char **endp, int base) FAST_FUNC; long bb_strtol(const char *arg, char **endp, int base) FAST_FUNC;
#if UINT_MAX == ULONG_MAX #if !defined(__ORCAC__) && UINT_MAX == ULONG_MAX
static ALWAYS_INLINE static ALWAYS_INLINE
unsigned bb_strtou(const char *arg, char **endp, int base) unsigned bb_strtou(const char *arg, char **endp, int base)
{ return bb_strtoul(arg, endp, base); } { return bb_strtoul(arg, endp, base); }