From f32a1b770a85d6b8d1e8a9d1b26f1e8c35d37f93 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tg@trevorgross.com>
Date: Mon, 22 Jun 2026 05:41:20 -0400
Subject: [PATCH] test: Include `linux/pidfd.h` on linux

Check whether there is really a conflict
---
 libc-test/build.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libc-test/build.rs b/libc-test/build.rs
index 5751828c2a421..79182977c6a67 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -3770,6 +3770,9 @@ fn test_linux(target: &str) {
         cfg.flag("-Wno-unused-function");
     }
 
+    // HACK:
+    cfg.define("HAVE_ARCH_STRUCT_FLOCK", None);
+
     headers!(
         cfg,
         "ctype.h",
@@ -3930,6 +3933,7 @@ fn test_linux(target: &str) {
             "linux/module.h",
             "linux/mount.h",
             "linux/net_tstamp.h",
+            "linux/pidfd.h",
             "linux/netfilter/nfnetlink.h",
             "linux/netfilter/nfnetlink_log.h",
             "linux/netfilter/nfnetlink_queue.h",
@@ -4591,7 +4595,7 @@ fn test_linux(target: &str) {
             "TRAP_PERF" => true,
 
             // headers conflicts with linux/pidfd.h
-            "PIDFD_NONBLOCK" => true,
+            // "PIDFD_NONBLOCK" => true,
             // Linux >= 6.9
             "PIDFD_THREAD"
             | "PIDFD_SIGNAL_THREAD"