diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:54:58 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:54:58 +1000 |
| commit | 1a286d510c2125bdab601ce47afd4d27b6ce6f41 (patch) | |
| tree | 0c17899352c5961b5e402dedd5813794f937e593 /include | |
| parent | 9df56f96fd9a213189ca94c1fccfc3c42bd9c16a (diff) | |
| parent | 19ced5c4253bc154aa499a72b6343e01245c92c0 (diff) | |
| download | busybox-w32-1a286d510c2125bdab601ce47afd4d27b6ce6f41.tar.gz busybox-w32-1a286d510c2125bdab601ce47afd4d27b6ce6f41.tar.bz2 busybox-w32-1a286d510c2125bdab601ce47afd4d27b6ce6f41.zip | |
Merge branch 'origin/master' (early part)
Conflicts:
libbb/Kbuild.src
Diffstat (limited to 'include')
| -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 c9b3ffaa0..1e3df0930 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -605,6 +605,8 @@ char *strncpy_IFNAMSIZ(char *dst, const char *src) FAST_FUNC; | |||
| 605 | /* Guaranteed to NOT be a macro (smallest code). Saves nearly 2k on uclibc. | 605 | /* Guaranteed to NOT be a macro (smallest code). Saves nearly 2k on uclibc. |
| 606 | * But potentially slow, don't use in one-billion-times loops */ | 606 | * But potentially slow, don't use in one-billion-times loops */ |
| 607 | int bb_putchar(int ch) FAST_FUNC; | 607 | int bb_putchar(int ch) FAST_FUNC; |
| 608 | /* Note: does not use stdio, writes to fd 2 directly */ | ||
| 609 | int bb_putchar_stderr(char ch) FAST_FUNC; | ||
| 608 | char *xasprintf(const char *format, ...) __attribute__ ((format(printf, 1, 2))) FAST_FUNC RETURNS_MALLOC; | 610 | char *xasprintf(const char *format, ...) __attribute__ ((format(printf, 1, 2))) FAST_FUNC RETURNS_MALLOC; |
| 609 | // gcc-4.1.1 still isn't good enough at optimizing it | 611 | // gcc-4.1.1 still isn't good enough at optimizing it |
| 610 | // (+200 bytes compared to macro) | 612 | // (+200 bytes compared to macro) |