diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /miscutils/strings.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'miscutils/strings.c')
| -rw-r--r-- | miscutils/strings.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/strings.c b/miscutils/strings.c index 40478de40..7ab0e227c 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
| @@ -9,10 +9,10 @@ | |||
| 9 | 9 | ||
| 10 | #include "libbb.h" | 10 | #include "libbb.h" |
| 11 | 11 | ||
| 12 | #define WHOLE_FILE 1 | 12 | #define WHOLE_FILE 1 |
| 13 | #define PRINT_NAME 2 | 13 | #define PRINT_NAME 2 |
| 14 | #define PRINT_OFFSET 4 | 14 | #define PRINT_OFFSET 4 |
| 15 | #define SIZE 8 | 15 | #define SIZE 8 |
| 16 | 16 | ||
| 17 | int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 17 | int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 18 | int strings_main(int argc UNUSED_PARAM, char **argv) | 18 | int strings_main(int argc UNUSED_PARAM, char **argv) |