X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Futil.h;h=51b1caf94614831759d0161d627918f3ad361a12;hb=aa62a8936f5983770e90b791083d55107659f7a1;hp=78b1444739227d6e27db1930e03b5aba8edba89f;hpb=a1937e679f76758635d295287398abe526de2522;p=elogind.git diff --git a/src/shared/util.h b/src/shared/util.h index 78b144473..51b1caf94 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -58,6 +58,14 @@ # error Unknown uid_t size #endif +#if SIZEOF_GID_T == 4 +# define GID_FMT "%" PRIu32 +#elif SIZEOF_GID_T == 2 +# define GID_FMT "%" PRIu16 +#else +# error Unknown gid_t size +#endif + #include "macro.h" #include "time-util.h" @@ -473,7 +481,7 @@ bool tty_is_console(const char *tty) _pure_; int vtnr_from_tty(const char *tty); const char *default_term_for_tty(const char *tty); -void execute_directory(const char *directory, DIR *_d, char *argv[]); +void execute_directory(const char *directory, DIR *_d, usec_t timeout, char *argv[]); int kill_and_sigcont(pid_t pid, int sig); @@ -883,3 +891,5 @@ int fd_warn_permissions(const char *path, int fd); unsigned long personality_from_string(const char *p); const char *personality_to_string(unsigned long); + +uint64_t physical_memory(void);