libkcapi/9000-fix-header-conflicts-for-kernel-v4.18.patch
Ondrej Mosnacek 2fb9e7a34e Add patch to work around FTBFS on rawhide
This commit adds a temporary workaround for failing builds with the new
4.18-rcX kernel on rawhide. The issue will likely be fixed in the kernel
before the final 4.18 release. The workaround can be removed then.

Upstream issue: https://github.com/smuellerDD/libkcapi/issues/59
2018-07-12 09:17:12 +02:00

25 lines
573 B
Diff

diff --git a/lib/internal.h b/lib/internal.h
index f9df585..b237822 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -23,7 +23,6 @@
#define _GNU_SOURCE
#include <unistd.h>
#include <sys/syscall.h>
-#include <linux/aio_abi.h>
#include <stdint.h>
#include <fcntl.h>
#include <sys/uio.h>
@@ -35,6 +34,11 @@
#include <limits.h>
#include <stdio.h>
+/* work around aio_abi.h pulling in headers that conflict with glibc typedefs */
+#define _UAPI_LINUX_SIGNAL_H
+#define _LINUX_SIGNAL_H
+
+#include <linux/aio_abi.h>
#include <linux/if_alg.h>
#include "atomic.h"