summaryrefslogtreecommitdiffstats
path: root/contrib/opie/libopie/insecure.c
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2010-01-11 16:27:56 +0000
committered <ed@FreeBSD.org>2010-01-11 16:27:56 +0000
commitcdcbec7f04d8bfca381ec7c6f4ef613661426a89 (patch)
treead6131d0d956eeb6eaf9273f44b28792534ec99d /contrib/opie/libopie/insecure.c
parentcd3015a67bce7ba4abc953858bb8b741950505c6 (diff)
downloadFreeBSD-src-cdcbec7f04d8bfca381ec7c6f4ef613661426a89.zip
FreeBSD-src-cdcbec7f04d8bfca381ec7c6f4ef613661426a89.tar.gz
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.
Diffstat (limited to 'contrib/opie/libopie/insecure.c')
-rw-r--r--contrib/opie/libopie/insecure.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/opie/libopie/insecure.c b/contrib/opie/libopie/insecure.c
index bc61c54..ba2a9df 100644
--- a/contrib/opie/libopie/insecure.c
+++ b/contrib/opie/libopie/insecure.c
@@ -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
OpenPOWER on IntegriCloud