[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: Re: [git commit] include: Fallback to UTMP unless there is UTMPX support
From: Denys Vlasenko <vda.linux () googlemail ! com>
Date: 2015-04-20 16:13:15
Message-ID: CAK1hOcPy0pUPypfFxx-+-7b9O2gkBEVMwMhpVvm7ncj5bRcmyQ () mail ! gmail ! com
[Download RAW message or body]
Works for me now. Thanks!
On Mon, Apr 20, 2015 at 3:24 PM, Bernhard Reutner-Fischer
<rep.dot.nop@gmail.com> wrote:
> commit: http://git.busybox.net/busybox/commit/?id=7d86384b246434e72533332f7f409a7aa9efeacb
> branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
>
> Fixes compilation against uClibc-0.9.30 for instance
>
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
> include/libbb.h | 25 ++++++++++++++++++++++++-
> 1 files changed, 24 insertions(+), 1 deletions(-)
>
> diff --git a/include/libbb.h b/include/libbb.h
> index 21da5f1..f0ac1f5 100644
> --- a/include/libbb.h
> +++ b/include/libbb.h
> @@ -84,7 +84,30 @@
> # include <selinux/av_permissions.h>
> #endif
> #if ENABLE_FEATURE_UTMP
> -# include <utmpx.h>
> +# if defined __UCLIBC__ && ( \
> + (UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 32) \
> + && UCLIBC_VERSION < KERNEL_VERSION(0, 9, 34) \
> + && defined __UCLIBC_HAS_UTMPX__ \
> + ) || ( \
> + UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 34) \
> + ) \
> + )
> +# include <utmpx.h>
> +# elif defined __UCLIBC__
> +# include <utmp.h>
> +# define utmpx utmp
> +# define setutxent setutent
> +# define endutxent endutent
> +# define getutxent getutent
> +# define getutxid getutid
> +# define getutxline getutline
> +# define pututxline pututline
> +# define utmpxname utmpname
> +# define updwtmpx updwtmp
> +# define _PATH_UTMPX _PATH_UTMP
> +# else
> +# include <utmpx.h>
> +# endif
> #endif
> #if ENABLE_LOCALE_SUPPORT
> # include <locale.h>
> _______________________________________________
> busybox-cvs mailing list
> busybox-cvs@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox-cvs
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic