diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2010-01-11 16:27:56 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2010-01-11 16:27:56 +0000 |
| commit | 7845988449df78d25c64ecab52dc5287b54c2454 (patch) | |
| tree | ad6131d0d956eeb6eaf9273f44b28792534ec99d /contrib/opie | |
| parent | ac24a8ea24a65307c036d88eeefe18b9a95d69cb (diff) | |
| download | src-7845988449df78d25c64ecab52dc5287b54c2454.tar.gz src-7845988449df78d25c64ecab52dc5287b54c2454.zip | |
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.
Notes
Notes:
svn path=/head/; revision=202086
Diffstat (limited to 'contrib/opie')
| -rw-r--r-- | contrib/opie/libopie/getutmpentry.c | 3 | ||||
| -rw-r--r-- | contrib/opie/libopie/insecure.c | 3 | ||||
| -rw-r--r-- | contrib/opie/libopie/login.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/contrib/opie/libopie/getutmpentry.c b/contrib/opie/libopie/getutmpentry.c index f3afe0c3aa18..06d22c816434 100644 --- a/contrib/opie/libopie/getutmpentry.c +++ b/contrib/opie/libopie/getutmpentry.c @@ -15,13 +15,14 @@ you didn't get a copy, you may request one from <license@inner.net>. #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 diff --git a/contrib/opie/libopie/insecure.c b/contrib/opie/libopie/insecure.c index bc61c5457ea3..ba2a9dfaeb5a 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 diff --git a/contrib/opie/libopie/login.c b/contrib/opie/libopie/login.c index 6c6ca79a37a1..bb0f3ae6b2d1 100644 --- a/contrib/opie/libopie/login.c +++ b/contrib/opie/libopie/login.c @@ -21,13 +21,14 @@ you didn't get a copy, you may request one from <license@inner.net>. #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 |