[libvirt] [PATCH] tests: avoid compile failure on linux kernels older than 2.6.19

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> --- tests/securityselinuxhelper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 89cba3a..d996825 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <dlfcn.h> #include <errno.h> -#include <linux/magic.h> +#if HAVE_LINUX_MAGIC_H +# include <linux/magic.h> +#endif #include <selinux/selinux.h> #include <stdio.h> #include <stdlib.h> @@ -33,6 +35,10 @@ #include <unistd.h> #include <attr/xattr.h> +#ifndef NFS_SUPER_MAGIC +# define NFS_SUPER_MAGIC 0x6969 +#endif + #include "virstring.h" static int (*realstatfs)(const char *path, struct statfs *buf); -- 1.8.3.1

On Mon, Oct 07, 2013 at 11:45:00AM +0200, Giuseppe Scrivano wrote:
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> --- tests/securityselinuxhelper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 89cba3a..d996825 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@
#include <dlfcn.h> #include <errno.h> -#include <linux/magic.h> +#if HAVE_LINUX_MAGIC_H +# include <linux/magic.h> +#endif #include <selinux/selinux.h> #include <stdio.h> #include <stdlib.h> @@ -33,6 +35,10 @@ #include <unistd.h> #include <attr/xattr.h>
+#ifndef NFS_SUPER_MAGIC +# define NFS_SUPER_MAGIC 0x6969 +#endif + #include "virstring.h"
static int (*realstatfs)(const char *path, struct statfs *buf);
ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 10/07/2013 04:28 AM, Daniel P. Berrange wrote:
On Mon, Oct 07, 2013 at 11:45:00AM +0200, Giuseppe Scrivano wrote:
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> --- tests/securityselinuxhelper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
ACK
Pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange
-
Eric Blake
-
Giuseppe Scrivano