* uniq.c: remove unneeded include and use short boilerplate.

	* coreutils.h: remove prototype of non-existing xgetoptfile_sort_uniq
	and add boilerplate.
	* networking/{ipaddr,ip,iplink,iproute,iptunnel}.c: touch includes
	and use short boilerplate.
	* libiproute/iproute.c: rename round to avoid clashes with older
	SuSE gcc and use short boilerplate.

2 files changed, 5 insertions, 16 deletions

diff --git a/coreutils/libcoreutils/coreutils.h b/coreutils/libcoreutils/coreutils.h
index eabca8204..b93731bc7 100644
--- a/coreutils/libcoreutils/coreutils.h
+++ b/coreutils/libcoreutils/coreutils.h
@@ -1,3 +1,7 @@
+/*
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ */
+
 #ifndef COREUTILS_H
 #define COREUTILS_H		1
 
@@ -7,6 +11,5 @@ extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf);
 extern int cp_mv_stat(const char *fn, struct stat *fn_stat);
 
 extern mode_t getopt_mk_fifo_nod(int argc, char **argv);
-extern FILE *xgetoptfile_sort_uniq(char **argv, const char *mode);
 
 #endif
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 93ae169f4..be3d75c3a 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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
- * 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 the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -29,7 +16,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include "busybox.h"
-#include "libcoreutils/coreutils.h"
 
 static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4";