[src/trunk]: src/lib/libutil/compat don't include things you don't need

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/790cfce302b9
branches:  trunk
changeset: 782482:790cfce302b9
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 04 13:08:56 2012 +0000

description:
don't include things you don't need

diffstat:

 lib/libutil/compat/compat_loginx.c |  10 ++++------
 lib/libutil/compat/util.h          |  15 ++++++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diffs (62 lines):

diff -r b076556f2697 -r 790cfce302b9 lib/libutil/compat/compat_loginx.c
--- a/lib/libutil/compat/compat_loginx.c        Sun Nov 04 12:01:55 2012 +0000
+++ b/lib/libutil/compat/compat_loginx.c        Sun Nov 04 13:08:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_loginx.c,v 1.2 2009/01/11 02:57:18 christos Exp $       */
+/*     $NetBSD: compat_loginx.c,v 1.3 2012/11/04 13:08:56 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1993
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_loginx.c,v 1.2 2009/01/11 02:57:18 christos Exp $");
+__RCSID("$NetBSD: compat_loginx.c,v 1.3 2012/11/04 13:08:56 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,12 +44,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <utmpx.h>
+#include <compat/include/utmpx.h>
 #include <util.h>
 #include <compat/util.h>
-#include <utmp.h>
-#include <compat/include/utmp.h>
-#include <utmpx.h>
-#include <compat/include/utmpx.h>
 
 __warn_references(loginx,
     "warning: reference to compatibility loginx(); include <util.h> to generate correct reference")
diff -r b076556f2697 -r 790cfce302b9 lib/libutil/compat/util.h
--- a/lib/libutil/compat/util.h Sun Nov 04 12:01:55 2012 +0000
+++ b/lib/libutil/compat/util.h Sun Nov 04 13:08:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.h,v 1.2 2009/01/11 02:57:18 christos Exp $        */
+/*     $NetBSD: util.h,v 1.3 2012/11/04 13:08:57 christos Exp $        */
 
 /*-
  * Copyright (c) 1995
@@ -34,10 +34,15 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <compat/include/pwd.h>
-#include <compat/include/utmp.h>
-#include <compat/include/utmpx.h>
-#include <machine/ansi.h>
+#include <sys/inttypes.h>
+#include <sys/ansi.h>
+
+struct utmp50;
+struct utmpx50;
+struct passwd50;
+struct utmp;
+struct utmpx;
+struct passwd;
 
 void           login(const struct utmp50 *);
 void           loginx(const struct utmpx50 *);