diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2002-08-12 04:32:41 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2002-08-12 04:32:41 +0000 |
| commit | 666e8f922ffe516cb4803887a91ddd75f308a79d (patch) | |
| tree | c1d5e82d40b2ca178d179d5f1887ef1f88142a53 /libc/stdio/stdio.c | |
| parent | 9a34fd5b8807487a89bb9dd4e895f1f448d75e94 (diff) | |
Revert commit by davidm to printf.c that initialized conv_num
needlessly. To do so increases the generated code size with bcc.
Eliminate duplicate define warnings in wstring.c.
Fix potentially broken preprocessor comparisons. The preprocessor
converts integers to maximal signed type, so inequality comparisons
involving UINTMAX_MAX, ULLONG_MAX, and (if no long long) ULONG_MAX
were potentially broken.
Diffstat (limited to 'libc/stdio/stdio.c')
| -rw-r--r-- | libc/stdio/stdio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/stdio/stdio.c b/libc/stdio/stdio.c index b4208f97c..2c5f3bbed 100644 --- a/libc/stdio/stdio.c +++ b/libc/stdio/stdio.c @@ -95,7 +95,7 @@ #ifndef __STDIO_THREADSAFE -#ifdef __BCC__ +#if defined(__BCC__) && 0 #define UNLOCKED_STREAM(RETURNTYPE,NAME,PARAMS,ARGS,STREAM) \ asm(".text\nexport _" "NAME" "_unlocked\n_" "NAME" "_unlocked = _" "NAME"); \ RETURNTYPE NAME PARAMS @@ -108,7 +108,7 @@ RETURNTYPE NAME PARAMS #define UNLOCKED(RETURNTYPE,NAME,PARAMS,ARGS) \ UNLOCKED_STREAM(RETURNTYPE,NAME,PARAMS,ARGS,stream) -#ifdef __BCC__ +#if defined(__BCC__) && 0 #define UNLOCKED_VOID_RETURN(NAME,PARAMS,ARGS) \ asm(".text\nexport _" "NAME" "_unlocked\n_" "NAME" "_unlocked = _" "NAME"); \ void NAME PARAMS @@ -3274,7 +3274,7 @@ void _stdio_fdout(int fd, ...) /* Avoid using long long / and % operations to cut down dependencies on * libgcc.a. Definitely helps on i386 at least. */ -#if (UINTMAX_MAX > UINT_MAX) && ((UINTMAX_MAX/UINT_MAX) - 2 <= UINT_MAX) +#if (INTMAX_MAX > INT_MAX) && (((INTMAX_MAX/INT_MAX)/2) - 2 <= INT_MAX) #define INTERNAL_DIV_MOD #endif |