From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 3 Jan 2013 17:24:10 +0000 (-0500)
Subject: clone: Support bionic's clone() defintion
X-Git-Tag: lxc-0.9.0.alpha3~1^2~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f1665e6caa1835a2c5c5e369d69b8fa225effe3;p=thirdparty%2Flxc.git

clone: Support bionic's clone() defintion

The clone() call in bionic is very slightly different.
This updates namespace.h to support both glibc and bionic.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/namespace.h b/src/lxc/namespace.h
index 109e0bb97..e35de60bc 100644
--- a/src/lxc/namespace.h
+++ b/src/lxc/namespace.h
@@ -26,6 +26,8 @@
 #include <sys/syscall.h>
 #include <sched.h>
 
+#include "config.h"
+
 #ifndef CLONE_FS
 #  define CLONE_FS                0x00000200
 #endif
@@ -47,9 +49,14 @@
 #ifndef CLONE_NEWNET
 #  define CLONE_NEWNET            0x40000000
 #endif
+#ifdef IS_BIONIC
+int clone(int (*fn)(void *), void *child_stack,
+	int flags, void *arg);
+#else
 int clone(int (*fn)(void *), void *child_stack,
 	int flags, void *arg, ...
 	/* pid_t *ptid, struct user_desc *tls, pid_t *ctid */ );
+#endif
 
 
 extern pid_t lxc_clone(int (*fn)(void *), void *arg, int flags);