aboutsummaryrefslogtreecommitdiff
path: root/include/libbb.h
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-02-22 10:00:45 +0000
committerRon Yorston <rmy@pobox.com>2016-02-22 10:00:45 +0000
commit371c20c008254a36e7157df6c13dc2e4cf87d6fd (patch)
treea214c03f6617dffa60df2192b312a46c93b7c19f /include/libbb.h
parentab879a41ab674129ef1593cda181cc8b64d0dadf (diff)
parent3a5cc989025eefe03fda0552b253a4a8f015a761 (diff)
downloadbusybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.tar.gz
busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.tar.bz2
busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'include/libbb.h')
-rw-r--r--include/libbb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 7959884e3..cb61faad9 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -20,6 +20,7 @@
20#include <netdb.h> 20#include <netdb.h>
21#include <setjmp.h> 21#include <setjmp.h>
22#include <signal.h> 22#include <signal.h>
23#include <paths.h>
23#if defined __UCLIBC__ /* TODO: and glibc? */ 24#if defined __UCLIBC__ /* TODO: and glibc? */
24/* use inlined versions of these: */ 25/* use inlined versions of these: */
25# define sigfillset(s) __sigfillset(s) 26# define sigfillset(s) __sigfillset(s)
@@ -106,7 +107,11 @@
106# define updwtmpx updwtmp 107# define updwtmpx updwtmp
107# define _PATH_UTMPX _PATH_UTMP 108# define _PATH_UTMPX _PATH_UTMP
108# else 109# else
110# include <utmp.h>
109# include <utmpx.h> 111# include <utmpx.h>
112# if defined _PATH_UTMP && !defined _PATH_UTMPX
113# define _PATH_UTMPX _PATH_UTMP
114# endif
110# endif 115# endif
111#endif 116#endif
112#if ENABLE_LOCALE_SUPPORT 117#if ENABLE_LOCALE_SUPPORT