diff options
author | Ron Yorston <rmy@pobox.com> | 2015-03-23 13:56:37 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-03-23 13:56:37 +0000 |
commit | 486a3907f353adeb7f3ced5357db1e604659b785 (patch) | |
tree | 5033870835b2b9d5b26ba1f4544943c47893b904 /include/libbb.h | |
parent | 74ba8c760f3337218cddabaaa0acc4e1f5d6e6c5 (diff) | |
parent | 1850d5ec0e90fbfb598ed7ad8ff0a63b6e5692ce (diff) | |
download | busybox-w32-486a3907f353adeb7f3ced5357db1e604659b785.tar.gz busybox-w32-486a3907f353adeb7f3ced5357db1e604659b785.tar.bz2 busybox-w32-486a3907f353adeb7f3ced5357db1e604659b785.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 1733e9a0f..28ac779c3 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -878,6 +878,8 @@ struct suffix_mult { | |||
878 | }; | 878 | }; |
879 | extern const struct suffix_mult bkm_suffixes[]; | 879 | extern const struct suffix_mult bkm_suffixes[]; |
880 | #define km_suffixes (bkm_suffixes + 1) | 880 | #define km_suffixes (bkm_suffixes + 1) |
881 | extern const struct suffix_mult cwbkMG_suffixes[]; | ||
882 | #define kMG_suffixes (cwbkMG_suffixes + 3) | ||
881 | 883 | ||
882 | #include "xatonum.h" | 884 | #include "xatonum.h" |
883 | /* Specialized: */ | 885 | /* Specialized: */ |