From 832ce65914d11b91e53439184d216e6eeeb81d2e Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 08:36:05 +0200
Subject: [PATCH] REORG: include: move proto_udp.h to haproxy/proto_udp{,-t}.h

No change was needed.
---
 include/{types/proto_udp.h => haproxy/proto_udp-t.h} | 8 ++++----
 include/{proto => haproxy}/proto_udp.h               | 8 ++++----
 include/types/dns.h                                  | 2 +-
 src/checks.c                                         | 2 +-
 src/dns.c                                            | 2 +-
 src/proto_udp.c                                      | 2 +-
 src/tools.c                                          | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename include/{types/proto_udp.h => haproxy/proto_udp-t.h} (92%)
 rename include/{proto => haproxy}/proto_udp.h (87%)

diff --git a/include/types/proto_udp.h b/include/haproxy/proto_udp-t.h
similarity index 92%
rename from include/types/proto_udp.h
rename to include/haproxy/proto_udp-t.h
index 2604418596..04f8708b51 100644
--- a/include/types/proto_udp.h
+++ b/include/haproxy/proto_udp-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/proto_udp.h
+ * include/haproxy/proto_udp-t.h
  * This file provides structures and types for UDP protocol.
  *
  * Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_PROTO_UDP_H
-#define _TYPES_PROTO_UDP_H
+#ifndef _HAPROXY_HAPROXY_UDP_T_H
+#define _HAPROXY_HAPROXY_UDP_T_H
 
 #include <arpa/inet.h>
 
@@ -49,4 +49,4 @@ struct dgram_data_cb {
 	void (*send)(struct dgram_conn *dgram); /* send callback */
 };
 
-#endif /* _TYPES_PROTO_UDP_H */
+#endif /* _HAPROXY_HAPROXY_UDP_T_H */
diff --git a/include/proto/proto_udp.h b/include/haproxy/proto_udp.h
similarity index 87%
rename from include/proto/proto_udp.h
rename to include/haproxy/proto_udp.h
index d1f0698c63..9f7178c192 100644
--- a/include/proto/proto_udp.h
+++ b/include/haproxy/proto_udp.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/proto_udp.h
+ * include/haproxy/proto_udp.h
  * This file provides functions related to UDP protocol.
  *
  * Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROTO_UDP_H
-#define _PROTO_PROTO_UDP_H
+#ifndef _HAPROXY_PROTO_UDP_H
+#define _HAPROXY_PROTO_UDP_H
 
 void dgram_fd_handler(int);
 
-#endif // _PROTO_PROTO_UDP_H
+#endif // _HAPROXY_PROTO_UDP_H
diff --git a/include/types/dns.h b/include/types/dns.h
index f504f5fbb2..8b25352e81 100644
--- a/include/types/dns.h
+++ b/include/types/dns.h
@@ -29,7 +29,7 @@
 
 #include <types/connection.h>
 #include <types/obj_type.h>
-#include <types/proto_udp.h>
+#include <haproxy/proto_udp-t.h>
 #include <types/proxy.h>
 #include <types/server.h>
 #include <types/task.h>
diff --git a/src/checks.c b/src/checks.c
index 3d3fbd118e..59c176031a 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -68,7 +68,7 @@
 #include <proto/vars.h>
 #include <proto/log.h>
 #include <proto/dns.h>
-#include <proto/proto_udp.h>
+#include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>
 #include <proto/sample.h>
 
diff --git a/src/dns.c b/src/dns.c
index a74bd36685..79a7a0d4cd 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -45,7 +45,7 @@
 #include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/task.h>
-#include <proto/proto_udp.h>
+#include <haproxy/proto_udp.h>
 #include <proto/proxy.h>
 #include <proto/stream_interface.h>
 #include <proto/tcp_rules.h>
diff --git a/src/proto_udp.c b/src/proto_udp.c
index a1d91760a7..93c03898f1 100644
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -12,7 +12,7 @@
 
 #include <types/global.h>
 #include <haproxy/fd-t.h>
-#include <types/proto_udp.h>
+#include <haproxy/proto_udp-t.h>
 
 #include <haproxy/fd.h>
 
diff --git a/src/tools.c b/src/tools.c
index fbec3f50cd..2b947933ea 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -48,7 +48,7 @@
 #include <proto/dns.h>
 #include <proto/hlua.h>
 #include <proto/listener.h>
-#include <proto/proto_udp.h>
+#include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream_interface.h>
 #include <proto/task.h>
-- 
2.47.3