From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 12 Feb 2019 00:52:10 +0000 (+0100)
Subject: fexecve: remove unnecessary #ifdef
X-Git-Tag: lxc-2.0.10~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5164df786b814064934cb22b9ca61064a1a29a2e;p=thirdparty%2Flxc.git

fexecve: remove unnecessary #ifdef

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/include/fexecve.c b/src/include/fexecve.c
index 21ccfe877..b4c0fe900 100644
--- a/src/include/fexecve.c
+++ b/src/include/fexecve.c
@@ -30,8 +30,9 @@
 
 #include "config.h"
 
-static int lxc_raw_execveat(int dirfd, const char *pathname, char *const argv[],
-			    char *const envp[], int flags)
+static inline int lxc_raw_execveat(int dirfd, const char *pathname,
+				   char *const argv[], char *const envp[],
+				   int flags)
 {
 #ifdef __NR_execveat
 	syscall(__NR_execveat, dirfd, pathname, argv, envp, flags);
@@ -51,11 +52,9 @@ int efexecve(int fd, char *const argv[], char *const envp[])
 		return -1;
 	}
 
-#ifdef __NR_execveat
 	lxc_raw_execveat(fd, "", argv, envp, AT_EMPTY_PATH);
 	if (errno != ENOSYS)
 		return -1;
-#endif
 
 	ret = snprintf(procfd, sizeof(procfd), "/proc/self/fd/%d", fd);
 	if (ret < 0 || (size_t)ret >= sizeof(procfd)) {