mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-06 03:40:56 -08:00
; 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.
This commit is contained in:
parent
6412ba2f1a
commit
0e390f54fa
6 changed files with 27 additions and 9 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue