From fa939aae8178b1675e6fa118c7da05ae575f87cd Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 5 Apr 2006 16:21:37 +0000 Subject: - include proper headers. --- archival/libunarchive/seek_by_char.c | 19 +++++-------------- archival/libunarchive/unpack_ar_archive.c | 17 +++-------------- libbb/messages.c | 1 - libpwdgrp/pwd_grp.c | 3 ++- libpwdgrp/pwd_grp_internal.c | 3 ++- networking/interface.c | 2 +- networking/libiproute/ip_parse_common_args.c | 2 +- 7 files changed, 14 insertions(+), 33 deletions(-) diff --git a/archival/libunarchive/seek_by_char.c b/archival/libunarchive/seek_by_char.c index 02874db51..81d5f8d7c 100644 --- a/archival/libunarchive/seek_by_char.c +++ b/archival/libunarchive/seek_by_char.c @@ -1,23 +1,14 @@ +/* vi:set ts=4:*/ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include #include "unarchive.h" -#include "busybox.h" +#include "libbb.h" + + /* If we are reading through a pipe(), or from stdin then we cant lseek, * we must read and discard the data to skip over it. diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c index 7bb40af5b..15e56a468 100644 --- a/archival/libunarchive/unpack_ar_archive.c +++ b/archival/libunarchive/unpack_ar_archive.c @@ -1,23 +1,12 @@ +/* vi:set ts=4:*/ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include #include #include #include "unarchive.h" -#include "busybox.h" +#include "libbb.h" void unpack_ar_archive(archive_handle_t *ar_archive) { diff --git a/libbb/messages.c b/libbb/messages.c index b9a5353a7..ab4c5d4b1 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -6,7 +6,6 @@ * */ -#include "busybox.h" #include "libbb.h" #ifdef L_full_version diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index f45c6317e..4f4e0410f 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c @@ -26,10 +26,11 @@ #include #include #include -#include "busybox.h" + #include "pwd_.h" #include "grp_.h" #include "shadow_.h" +#include "libbb.h" #ifndef _PATH_SHADOW #define _PATH_SHADOW "/etc/shadow" diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c index d2915c9ee..9cb1d306a 100644 --- a/libpwdgrp/pwd_grp_internal.c +++ b/libpwdgrp/pwd_grp_internal.c @@ -26,10 +26,11 @@ #include #include #include -#include "busybox.h" + #include "pwd_.h" #include "grp_.h" #include "shadow_.h" +#include "libbb.h" #ifndef _PATH_SHADOW #define _PATH_SHADOW "/etc/shadow" diff --git a/networking/interface.c b/networking/interface.c index 5c1ee92cd..39fd44cc2 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -73,7 +73,7 @@ #include #include #include -#include "libbb.h" +#include "busybox.h" #ifdef CONFIG_FEATURE_IPV6 # define HAVE_AFINET6 1 diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index a76df48e0..52e549ea2 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c @@ -16,10 +16,10 @@ #include +#include "libbb.h" #include "utils.h" #include "ip_common.h" -#include "busybox.h" int preferred_family = AF_UNSPEC; int oneline = 0; -- cgit v1.2.3