diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:07:00 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:07:00 +1000 |
| commit | a6a2325ecf402054132daae169f71edb0fb849e3 (patch) | |
| tree | 97ede2815e2dd15a01515517c0495a64720414e3 /libbb | |
| parent | c31744ca1a86b2276c37c6d9a884660185debed6 (diff) | |
| parent | 020465218ccff1195a47a890037db37d0395c9d9 (diff) | |
| download | busybox-w32-a6a2325ecf402054132daae169f71edb0fb849e3.tar.gz busybox-w32-a6a2325ecf402054132daae169f71edb0fb849e3.tar.bz2 busybox-w32-a6a2325ecf402054132daae169f71edb0fb849e3.zip | |
Merge branch 'origin/master' (early part)
Conflicts:
shell/ash.c
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/get_line_from_file.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 3cb46d240..cbfb45b7c 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c | |||
| @@ -9,11 +9,6 @@ | |||
| 9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | /* for getline() [GNUism] | ||
| 13 | #ifndef _GNU_SOURCE | ||
| 14 | #define _GNU_SOURCE 1 | ||
| 15 | #endif | ||
| 16 | */ | ||
| 17 | #include "libbb.h" | 12 | #include "libbb.h" |
| 18 | 13 | ||
| 19 | /* This function reads an entire line from a text file, up to a newline | 14 | /* This function reads an entire line from a text file, up to a newline |