File webkitgtk-memfd-build-fix.patch of Package webkit2gtk3.22329

Overview Repositories Revisions Requests Users Attributes Meta

File webkitgtk-memfd-build-fix.patch of Package webkit2gtk3.22329

diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
index 0d5dd4f6986d6733f6ffcb68b9fab9113bb5327b..dfa9ac39a045e7cce9dc231c529115963ec021f6 100644
--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
@@ -32,10 +32,6 @@
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/glib/GUniquePtr.h>
 
-#if !defined(MFD_ALLOW_SEALING) && HAVE(LINUX_MEMFD_H)
-#include <linux/memfd.h>
-#endif
-
 #include "Syscalls.h"
 
 #if PLATFORM(GTK)
@@ -48,12 +44,16 @@
 #define BASE_DIRECTORY "wpe"
 #endif
 
-#if !defined(MFD_ALLOW_SEALING) && HAVE(LINUX_MEMFD_H)
-
+#if !defined(MFD_ALLOW_SEALING)
 // These defines were added in glibc 2.27, the same release that added memfd_create.
 // But the kernel added all of this in Linux 3.17. So it's totally safe for us to
 // depend on, as long as we define it all ourselves. Remove this once we depend on
 // glibc 2.27.
+//
+// P.S. linux/memfd.h defines MFD_ALLOW_SEALING, so must not be included prior
+// to this point.
+
+#include <linux/memfd.h>
 
 #define F_ADD_SEALS 1033
 #define F_GET_SEALS 1034
@@ -67,7 +67,7 @@ static int memfd_create(const char* name, unsigned flags)
 {
     return syscall(__NR_memfd_create, name, flags);
 }
-#endif // #if !defined(MFD_ALLOW_SEALING) && HAVE(LINUX_MEMFD_H)
+#endif // #if !defined(MFD_ALLOW_SEALING)
 
 namespace WebKit {
 using namespace WebCore;

Places

File webkitgtk-memfd-build-fix.patch of Package webkit2gtk3.22329

Places