From f07f30c15fff3c205f7457c06fc8bdd1fdd04c78 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 08:41:30 +0200
Subject: [PATCH] REORG: include: move proto/proto_sockpair.h to
 haproxy/proto_sockpair.h

This one didn't have any types file and was moved as-is.
---
 include/{proto => haproxy}/proto_sockpair.h | 6 +++---
 src/listener.c                              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename include/{proto => haproxy}/proto_sockpair.h (89%)

diff --git a/include/proto/proto_sockpair.h b/include/haproxy/proto_sockpair.h
similarity index 89%
rename from include/proto/proto_sockpair.h
rename to include/haproxy/proto_sockpair.h
index 4692461ba..ff1482e20 100644
--- a/include/proto/proto_sockpair.h
+++ b/include/haproxy/proto_sockpair.h
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROTO_SOCKPAIR_H
-# define _PROTO_PROTO_SOCKPAIR_H
+#ifndef _HAPROXY_PROTO_SOCKPAIR_H
+#define _HAPROXY_PROTO_SOCKPAIR_H
 
 int recv_fd_uxst(int sock);
 int send_fd_uxst(int fd, int send_fd);
 
-#endif /* _PROTO_PROTO_SOCKPAIR_H  */
+#endif /* _HAPROXY_PROTO_SOCKPAIR_H  */
 
diff --git a/src/listener.c b/src/listener.c
index aa935d6da..80289b1a1 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -35,7 +35,7 @@
 #include <proto/log.h>
 #include <proto/listener.h>
 #include <haproxy/protocol.h>
-#include <proto/proto_sockpair.h>
+#include <haproxy/proto_sockpair.h>
 #include <proto/sample.h>
 #include <proto/stream.h>
 #include <proto/task.h>