chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use strlen even for constant strings
[elogind.git]
/
src
/
shared
/
missing.h
diff --git
a/src/shared/missing.h
b/src/shared/missing.h
index 3142306e35c2375382c2539ea81787cb674d4ad9..4e63fb9ac450a627adac1eb8e2788770036c2b80 100644
(file)
--- a/
src/shared/missing.h
+++ b/
src/shared/missing.h
@@
-47,6
+47,9
@@
#define RLIMIT_RTTIME 15
#endif
#define RLIMIT_RTTIME 15
#endif
+/* If RLIMIT_RTTIME is not defined, then we cannot use RLIMIT_NLIMITS as is */
+#define _RLIMIT_MAX (RLIMIT_RTTIME+1 > RLIMIT_NLIMITS ? RLIMIT_RTTIME+1 : RLIMIT_NLIMITS)
+
#ifndef F_LINUX_SPECIFIC_BASE
#define F_LINUX_SPECIFIC_BASE 1024
#endif
#ifndef F_LINUX_SPECIFIC_BASE
#define F_LINUX_SPECIFIC_BASE 1024
#endif
@@
-273,25
+276,17
@@
static inline pid_t gettid(void) {
#define MAX_HANDLE_SZ 128
#endif
#define MAX_HANDLE_SZ 128
#endif
-#if
defined __x86_64__
-# if
ndef __NR_name_to_handle_at
+#if
ndef __NR_name_to_handle_at
+# if
defined(__x86_64__)
# define __NR_name_to_handle_at 303
# define __NR_name_to_handle_at 303
-# endif
-#elif defined __i386__
-# ifndef __NR_name_to_handle_at
+# elif defined(__i386__)
# define __NR_name_to_handle_at 341
# define __NR_name_to_handle_at 341
-# endif
-#elif defined __arm__
-# ifndef __NR_name_to_handle_at
+# elif defined(__arm__)
# define __NR_name_to_handle_at 370
# define __NR_name_to_handle_at 370
-# endif
-#elif defined __powerpc__
-# ifndef __NR_name_to_handle_at
+# elif defined(__powerpc__)
# define __NR_name_to_handle_at 345
# define __NR_name_to_handle_at 345
-# endif
-#else
-# ifndef __NR_name_to_handle_at
-# error __NR_name_to_handle_at is not defined
+# else
+# error "__NR_name_to_handle_at is not defined"
# endif
#endif
# endif
#endif
@@
-311,7
+306,7
@@
static inline int name_to_handle_at(int fd, const char *name, struct file_handle
# ifdef HAVE___SECURE_GETENV
# define secure_getenv __secure_getenv
# else
# ifdef HAVE___SECURE_GETENV
# define secure_getenv __secure_getenv
# else
-# error
neither secure_getenv nor __secure_getenv are available
+# error
"neither secure_getenv nor __secure_getenv are available"
# endif
#endif
# endif
#endif