diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2ccb6e7bb..ad64bad84 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -88,13 +88,14 @@ | |||
88 | # define STRTOOFF strtol | 88 | # define STRTOOFF strtol |
89 | # define SAFE_STRTOOFF safe_strtol | 89 | # define SAFE_STRTOOFF safe_strtol |
90 | # define XSTRTOUOFF xstrtoul | 90 | # define XSTRTOUOFF xstrtoul |
91 | # define OFF_FMT "ld" | 91 | /* usage: printf("size: %"OFF_FMT"d (%"OFF_FMT"x)\n", sz, sz); */ |
92 | # define OFF_FMT "l" | ||
92 | # else | 93 | # else |
93 | /* "long" is too short, need "long long" */ | 94 | /* "long" is too short, need "long long" */ |
94 | # define STRTOOFF strtoll | 95 | # define STRTOOFF strtoll |
95 | # define SAFE_STRTOOFF safe_strtoll | 96 | # define SAFE_STRTOOFF safe_strtoll |
96 | # define XSTRTOUOFF xstrtoull | 97 | # define XSTRTOUOFF xstrtoull |
97 | # define OFF_FMT "lld" | 98 | # define OFF_FMT "ll" |
98 | # endif | 99 | # endif |
99 | #else | 100 | #else |
100 | # if 0 /* #if UINT_MAX == 0xffffffff */ | 101 | # if 0 /* #if UINT_MAX == 0xffffffff */ |
@@ -103,12 +104,12 @@ | |||
103 | # define STRTOOFF strtol | 104 | # define STRTOOFF strtol |
104 | # define SAFE_STRTOOFF safe_strtoi | 105 | # define SAFE_STRTOOFF safe_strtoi |
105 | # define XSTRTOUOFF xstrtou | 106 | # define XSTRTOUOFF xstrtou |
106 | # define OFF_FMT "d" | 107 | # define OFF_FMT "" |
107 | # else | 108 | # else |
108 | # define STRTOOFF strtol | 109 | # define STRTOOFF strtol |
109 | # define SAFE_STRTOOFF safe_strtol | 110 | # define SAFE_STRTOOFF safe_strtol |
110 | # define XSTRTOUOFF xstrtoul | 111 | # define XSTRTOUOFF xstrtoul |
111 | # define OFF_FMT "ld" | 112 | # define OFF_FMT "l" |
112 | # endif | 113 | # endif |
113 | #endif | 114 | #endif |
114 | /* scary. better ideas? (but do *test* them first!) */ | 115 | /* scary. better ideas? (but do *test* them first!) */ |
@@ -703,7 +704,7 @@ extern const char bb_default_login_shell[]; | |||
703 | #define RB_POWER_OFF 0x4321fedc | 704 | #define RB_POWER_OFF 0x4321fedc |
704 | #endif | 705 | #endif |
705 | 706 | ||
706 | // Make sure we call functions instead of macros. | 707 | /* Make sure we call functions instead of macros. */ |
707 | #undef isalnum | 708 | #undef isalnum |
708 | #undef isalpha | 709 | #undef isalpha |
709 | #undef isascii | 710 | #undef isascii |