From cd57511eaecc40021ab63c90b5e3f2558f4a07ce Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Tue, 12 Dec 2023 10:21:55 -0700
Subject: [PATCH] Remove inclusion from header causing conflicts.

---
 3rd_party/folly/conandata.yml               |  2 ++
 3rd_party/folly/patches/0025-timespec.patch | 38 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 3rd_party/folly/patches/0025-timespec.patch

diff --git a/3rd_party/folly/conandata.yml b/3rd_party/folly/conandata.yml
index 9b806191..41532ccf 100644
--- a/3rd_party/folly/conandata.yml
+++ b/3rd_party/folly/conandata.yml
@@ -70,3 +70,5 @@ patches:
       base_path: "source_subfolder"
     - patch_file: "patches/0024-compiler-flags.patch"
       base_path: "source_subfolder"
+    - patch_file: "patches/0025-timespec.patch"
+      base_path: "source_subfolder"
diff --git a/3rd_party/folly/patches/0025-timespec.patch b/3rd_party/folly/patches/0025-timespec.patch
new file mode 100644
index 00000000..974a120d
--- /dev/null
+++ b/3rd_party/folly/patches/0025-timespec.patch
@@ -0,0 +1,38 @@
+diff -Naur a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
+--- a/folly/io/async/AsyncSocket.cpp	2023-12-08 20:38:13.000000000 -0700
++++ b/folly/io/async/AsyncSocket.cpp	2023-12-12 10:15:06.023030521 -0700
+@@ -18,6 +18,9 @@
+ 
+ #include <sys/types.h>
+ 
++/* for struct sock_extended_err*/
++#include <linux/errqueue.h>
++
+ #include <cerrno>
+ #include <climits>
+ #include <sstream>
+diff -Naur a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
+--- a/folly/io/async/AsyncUDPSocket.cpp	2023-12-08 20:38:13.000000000 -0700
++++ b/folly/io/async/AsyncUDPSocket.cpp	2023-12-12 10:19:06.419424565 -0700
+@@ -17,6 +17,9 @@
+ #include <folly/io/SocketOptionMap.h>
+ #include <folly/io/async/AsyncUDPSocket.h>
+ 
++/* for struct sock_extended_err*/
++#include <linux/errqueue.h>
++
+ #include <cerrno>
+ 
+ #include <boost/preprocessor/control/if.hpp>
+diff -Naur a/folly/net/NetOps.h b/folly/net/NetOps.h
+--- a/folly/net/NetOps.h	2023-12-12 10:16:10.675139766 -0700
++++ b/folly/net/NetOps.h	2023-12-12 10:15:55.087113425 -0700
+@@ -114,7 +114,7 @@
+ #endif
+ #endif
+ /* for struct sock_extended_err*/
+-#include <linux/errqueue.h>
++#include <linux/types.h>
+ #endif
+ #endif
+