diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-08-14 09:15:51 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-08-14 09:15:51 +0800 |
| commit | 0e390f54fa61a5a8c9481a862803d0de78815d6a (patch) | |
| tree | dbce229eb26813abbb4f1004b5aeaddd5a757ae4 /lib/boot-time.c | |
| parent | 6412ba2f1ad93bf641b86ba7633beb4f6dda89ea (diff) | |
| download | emacs-0e390f54fa61a5a8c9481a862803d0de78815d6a.tar.gz | |
; Update from Gnulib
* lib/boot-time-aux.h (get_linux_uptime):
* lib/boot-time.c (UT_USER):
* lib/nproc.c (num_processors_ignoring_omp):
* lib/readutmp.h (WTMP_FILE):
* m4/readutmp.m4 (gl_READUTMP):
* m4/stdint.m4: Update from Gnulib.
Diffstat (limited to 'lib/boot-time.c')
| -rw-r--r-- | lib/boot-time.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/boot-time.c b/lib/boot-time.c index d813bfa5825..fe5b5b88c8e 100644 --- a/lib/boot-time.c +++ b/lib/boot-time.c @@ -32,7 +32,7 @@ # include <time.h> #endif -#if HAVE_SYS_SYSCTL_H && !defined __minix +#if HAVE_SYS_SYSCTL_H && !(defined __GLIBC__ && defined __linux__) && !defined __minix # if HAVE_SYS_PARAM_H # include <sys/param.h> # endif @@ -65,8 +65,10 @@ # define UT_USER(UT) ((UT)->ut_user) #endif -#if !HAVE_UTMPX_H && HAVE_UTMP_H && defined UTMP_NAME_FUNCTION && !HAVE_DECL_GETUTENT -struct utmp *getutent (void); +#if !HAVE_UTMPX_H && HAVE_UTMP_H && defined UTMP_NAME_FUNCTION +# if !HAVE_DECL_ENDUTENT /* Android */ +void endutent (void); +# endif #endif #if defined __linux__ || HAVE_UTMPX_H || HAVE_UTMP_H || defined __CYGWIN__ || defined _WIN32 |