diff options
| -rw-r--r-- | src/libudev/exit-status.h | 4 | ||||
| -rw-r--r-- | src/libudev/macro.h | 2 | ||||
| -rw-r--r-- | src/libudev/missing.h | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/src/libudev/exit-status.h b/src/libudev/exit-status.h index d3b548fc96..58f734b6f2 100644 --- a/src/libudev/exit-status.h +++ b/src/libudev/exit-status.h @@ -22,7 +22,9 @@ ***/ #include <stdbool.h> +#include "macro.h" #include "set.h" + typedef enum ExitStatus { /* EXIT_SUCCESS defined by libc */ /* EXIT_FAILURE defined by libc */ @@ -82,7 +84,7 @@ typedef struct ExitStatusSet { Set *signal; } ExitStatusSet; -const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level); +const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) _const_; bool is_clean_exit(int code, int status, ExitStatusSet *success_status); bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status); diff --git a/src/libudev/macro.h b/src/libudev/macro.h index 4089003e64..bfe03f2ae0 100644 --- a/src/libudev/macro.h +++ b/src/libudev/macro.h @@ -114,6 +114,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { _a < _b ? _a : _b; \ }) +#ifndef CLAMP #define CLAMP(x, low, high) \ __extension__ ({ \ typeof(x) _x = (x); \ @@ -121,6 +122,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { typeof(high) _high = (high); \ ((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \ }) +#endif #define assert_se(expr) \ do { \ diff --git a/src/libudev/missing.h b/src/libudev/missing.h index 0c8ae7f381..aa578d1fe0 100644 --- a/src/libudev/missing.h +++ b/src/libudev/missing.h @@ -138,7 +138,8 @@ static inline int fanotify_init(unsigned int flags, unsigned int event_f_flags) #ifndef HAVE_FANOTIFY_MARK static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname) { -#if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ +#if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ \ + || defined __arm__ && !defined __aarch64__ union { uint64_t _64; uint32_t _32[2]; @@ -196,6 +197,14 @@ static inline pid_t gettid(void) { #define MS_STRICTATIME (1<<24) #endif +#ifndef MS_REC +#define MS_REC 16384 +#endif + +#ifndef MS_SHARED +#define MS_SHARED (1<<20) +#endif + #ifndef PR_SET_NO_NEW_PRIVS #define PR_SET_NO_NEW_PRIVS 38 #endif @@ -245,3 +254,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle #ifndef CIFS_MAGIC_NUMBER #define CIFS_MAGIC_NUMBER 0xFF534D42 #endif + +#ifndef TFD_TIMER_CANCEL_ON_SET +#define TFD_TIMER_CANCEL_ON_SET (1 << 1) +#endif |