chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: check for name_to_handle_at declaration instead of its definition
[elogind.git]
/
src
/
shared
/
missing.h
diff --git
a/src/shared/missing.h
b/src/shared/missing.h
index 7fbb9259ebae8151746058c8444f88a66f32480c..1a31066032e7de740ab21116fbf3b8dbae86b7d9 100644
(file)
--- a/
src/shared/missing.h
+++ b/
src/shared/missing.h
@@
-26,6
+26,7
@@
#include <sys/resource.h>
#include <sys/syscall.h>
#include <fcntl.h>
#include <sys/resource.h>
#include <sys/syscall.h>
#include <fcntl.h>
+#include <stdlib.h>
#include <unistd.h>
#include <linux/oom.h>
#include <unistd.h>
#include <linux/oom.h>
@@
-208,17
+209,16
@@
static inline pid_t gettid(void) {
#endif
#ifdef __x86_64__
#endif
#ifdef __x86_64__
-# ifndef __NR_name_to_handle
-# define __NR_name_to_handle 303
+# ifndef __NR_name_to_handle
_at
+# define __NR_name_to_handle
_at
303
# endif
#else
# endif
#else
-# ifndef __NR_name_to_handle
-# define __NR_name_to_handle 341
+# ifndef __NR_name_to_handle
_at
+# define __NR_name_to_handle
_at
341
# endif
#endif
# endif
#endif
-#ifndef HAVE_NAME_TO_HANDLE_AT
-
+#if !HAVE_DECL_NAME_TO_HANDLE_AT
struct file_handle {
unsigned int handle_bytes;
int handle_type;
struct file_handle {
unsigned int handle_bytes;
int handle_type;
@@
-229,3
+229,11
@@
static inline int name_to_handle_at(int fd, const char *name, struct file_handle
return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
}
#endif
return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
}
#endif
+
+#ifndef HAVE_SECURE_GETENV
+# ifdef HAVE___SECURE_GETENV
+# define secure_getenv __secure_getenv
+# else
+# error neither secure_getenv nor __secure_getenv are available
+# endif
+#endif