BUILD: quic: fix build errors on FreeBSD since recent GSO changes

The following commits broke the build on FreeBSD when QUIC is enabled:

  35470d518 ("MINOR: quic: activate UDP GSO for QUIC if supported")
  448d3d388 ("MINOR: quic: add GSO parameter on quic_sock send API")

Indeed, it turns out that netinet/udp.h requires sys/types.h to be
included before. Let's just change the includes order to fix the build.
No backport is needed.

diff --git a/src/cfgparse-quic.c b/src/cfgparse-quic.c
index 7924281badcf2e154a905bb2359ade2c90a72c8a..fe4e35682576f4fc63521118a7940ee89a6ea34b 100644 (file)
--- a/src/cfgparse-quic.c
+++ b/src/cfgparse-quic.c
@@ -1,5 +1,7 @@
 #include <errno.h>
 #include <string.h>
+
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
 

diff --git a/src/quic_sock.c b/src/quic_sock.c
index a894396497fc012500835cd4463ea0ff99e593a3..327deb492fcd9364fd7c329d684960c47d623f93 100644 (file)
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -15,10 +15,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <netinet/in.h>
-#include <netinet/udp.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/udp.h>
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>