diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2023-08-15 15:46:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-08-15 15:55:40 -0700 |
| commit | 63d8d652298861581a7b9a7e44273164fa5aa4af (patch) | |
| tree | e59b9f29ec0421377c0aa0855e0efc05575bf657 /lib | |
| parent | c9fbd8950bbdece8cea426d1bcc5b764cf3b0592 (diff) | |
| download | emacs-63d8d652298861581a7b9a7e44273164fa5aa4af.tar.gz | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/readutmp.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/readutmp.h b/lib/readutmp.h index 3ddecf37272..fa30fa9a004 100644 --- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -270,21 +270,19 @@ struct utmpx32 /* Macros that test (UT)->ut_type. */ #ifdef BOOT_TIME -# define UT_TYPE_BOOT_TIME(UT) UT_TYPE_EQ (UT, BOOT_TIME) +# define UT_TYPE_BOOT_TIME(UT) ((UT)->ut_type == BOOT_TIME) #else # define UT_TYPE_BOOT_TIME(UT) 0 #endif #ifdef USER_PROCESS -# define UT_TYPE_USER_PROCESS(UT) UT_TYPE_EQ (UT, USER_PROCESS) +# define UT_TYPE_USER_PROCESS(UT) ((UT)->ut_type == USER_PROCESS) #else # define UT_TYPE_USER_PROCESS(UT) 0 #endif /* Determines whether an entry *UT corresponds to a user process. */ #define IS_USER_PROCESS(UT) \ - (UT_USER (UT)[0] \ - && (UT_TYPE_USER_PROCESS (UT) \ - || (UT_TYPE_NOT_DEFINED && UT_TIME_MEMBER (UT) != 0))) + ((UT)->ut_user[0] && UT_TYPE_USER_PROCESS (UT)) /* Define if read_utmp is not just a dummy. */ #if READUTMP_USE_SYSTEMD || HAVE_UTMPX_H || HAVE_UTMP_H || defined __CYGWIN__ || defined _WIN32 |