From owner-svn-src-head@FreeBSD.ORG  Mon Jan 11 16:27:56 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D81031065679;
	Mon, 11 Jan 2010 16:27:56 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD4368FC14;
	Mon, 11 Jan 2010 16:27:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BGRuhk013183;
	Mon, 11 Jan 2010 16:27:56 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BGRuov013179;
	Mon, 11 Jan 2010 16:27:56 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001111627.o0BGRuov013179@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 11 Jan 2010 16:27:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202086 - head/contrib/opie/libopie
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jan 2010 16:27:56 -0000

Author: ed
Date: Mon Jan 11 16:27:56 2010
New Revision: 202086
URL: http://svn.freebsd.org/changeset/base/202086

Log:
  Don't include <utmp.h> when using <utmpx.h>.
  
  libopie includes both <utmp.h> and <utmpx.h> in this case and uses some
  #defines to let the code use struct utmpx and its utility functions.
  We'd better not include <utmp.h> here, because maybe it will not be
  present in the future.

Modified:
  head/contrib/opie/libopie/getutmpentry.c
  head/contrib/opie/libopie/insecure.c
  head/contrib/opie/libopie/login.c

Modified: head/contrib/opie/libopie/getutmpentry.c
==============================================================================
--- head/contrib/opie/libopie/getutmpentry.c	Mon Jan 11 16:01:20 2010	(r202085)
+++ head/contrib/opie/libopie/getutmpentry.c	Mon Jan 11 16:27:56 2010	(r202086)
@@ -15,13 +15,14 @@ you didn't get a copy, you may request o
 #include "opie_cfg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <utmp.h>
 
 #if DOUTMPX
 #include <utmpx.h>
 #define setutent setutxent
 #define getutline(x) getutxline(x)
 #define utmp utmpx
+#else
+#include <utmp.h>
 #endif /* DOUTMPX */
 
 #if HAVE_STRING_H

Modified: head/contrib/opie/libopie/insecure.c
==============================================================================
--- head/contrib/opie/libopie/insecure.c	Mon Jan 11 16:01:20 2010	(r202085)
+++ head/contrib/opie/libopie/insecure.c	Mon Jan 11 16:27:56 2010	(r202086)
@@ -39,11 +39,12 @@ $FreeBSD$
 #include <sys/param.h>
 #include <unistd.h>
 
-#include <utmp.h>
 #if DOUTMPX
 #include <utmpx.h>
 #define utmp utmpx
 #define endutent endutxent
+#else
+#include <utmp.h>
 #endif	/* DOUTMPX */
 
 #if HAVE_SYS_UTSNAME_H

Modified: head/contrib/opie/libopie/login.c
==============================================================================
--- head/contrib/opie/libopie/login.c	Mon Jan 11 16:01:20 2010	(r202085)
+++ head/contrib/opie/libopie/login.c	Mon Jan 11 16:27:56 2010	(r202086)
@@ -21,13 +21,14 @@ you didn't get a copy, you may request o
 #include "opie_cfg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <utmp.h>
 
 #if DOUTMPX
 #include <utmpx.h>
 #define pututline(x) pututxline(x)
 #define endutent endutxent
 #define utmp utmpx
+#else
+#include <utmp.h>
 #endif /* DOUTMPX */
 
 #if HAVE_STRING_H