From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 15:37:26 +0000 (+0200)
Subject: REORG: include: move signal.h to haproxy/signal{,-t}.h
X-Git-Tag: v2.2-dev9~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3727a8a0837dfb2f4188a9c3bdfc550385d71fe3;p=thirdparty%2Fhaproxy.git

REORG: include: move signal.h to haproxy/signal{,-t}.h

No change was necessary. Include from wdt.c was dropped since unneeded.
---

diff --git a/include/haproxy/mworker-t.h b/include/haproxy/mworker-t.h
index 7712d285a1..a84512b987 100644
--- a/include/haproxy/mworker-t.h
+++ b/include/haproxy/mworker-t.h
@@ -15,7 +15,7 @@
 #define _HAPROXY_MWORKER_T_H_
 
 #include <haproxy/list.h>
-#include <types/signal.h>
+#include <haproxy/signal-t.h>
 
 /* options for mworker_proc */
 
diff --git a/include/haproxy/mworker.h b/include/haproxy/mworker.h
index 6d115ecf50..edc612ec30 100644
--- a/include/haproxy/mworker.h
+++ b/include/haproxy/mworker.h
@@ -15,7 +15,7 @@
 #define _HAPROXY_MWORKER_H_
 
 #include <haproxy/mworker-t.h>
-#include <types/signal.h>
+#include <haproxy/signal-t.h>
 
 void mworker_proc_list_to_env();
 void mworker_env_to_proc_list();
diff --git a/include/types/signal.h b/include/haproxy/signal-t.h
similarity index 93%
rename from include/types/signal.h
rename to include/haproxy/signal-t.h
index 70cce77e29..3991f56ea3 100644
--- a/include/types/signal.h
+++ b/include/haproxy/signal-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/signal.h
+ * include/haproxy/signal-t.h
  * Asynchronous signal delivery functions descriptors.
  *
  * Copyright 2000-2010 Willy Tarreau <w@1wt.eu>
@@ -11,9 +11,8 @@
  *
  */
 
-#ifndef _TYPES_SIGNAL_H
-#define _TYPES_SIGNAL_H
-
+#ifndef _HAPROXY_SIGNAL_T_H
+#define _HAPROXY_SIGNAL_T_H
 
 #include <signal.h>
 #include <haproxy/api-t.h>
@@ -58,7 +57,7 @@ struct signal_descriptor {
 	struct list handlers;           /* sig_handler */
 };
 
-#endif /* _TYPES_SIGNAL_H */
+#endif /* _HAPROXY_SIGNAL_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/signal.h b/include/haproxy/signal.h
similarity index 93%
rename from include/proto/signal.h
rename to include/haproxy/signal.h
index 04dc449ce7..763cfb0bef 100644
--- a/include/proto/signal.h
+++ b/include/haproxy/signal.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/signal.h
+ * include/haproxy/signal.h
  * Asynchronous signal delivery functions.
  *
  * Copyright 2000-2010 Willy Tarreau <w@1wt.eu>
@@ -12,10 +12,11 @@
  */
 
 #include <signal.h>
-#include <haproxy/thread.h>
 
-#include <types/signal.h>
+#include <haproxy/api.h>
+#include <haproxy/signal-t.h>
 #include <haproxy/task-t.h>
+#include <haproxy/thread.h>
 
 extern int signal_queue_len;
 extern struct signal_descriptor signal_state[];
diff --git a/src/checks.c b/src/checks.c
index 0cb718b988..a9feb79d24 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -45,6 +45,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/h1.h>
 #include <haproxy/htx.h>
+#include <haproxy/signal.h>
 #include <haproxy/task.h>
 #include <haproxy/vars.h>
 
@@ -63,7 +64,6 @@
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/signal.h>
 #include <proto/stream_interface.h>
 #include <proto/log.h>
 #include <haproxy/proto_udp.h>
diff --git a/src/debug.c b/src/debug.c
index 30a41161bb..0726d7d66e 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -30,7 +30,6 @@
 #include <haproxy/tools.h>
 
 #include <haproxy/global.h>
-#include <types/signal.h>
 
 #include <proto/cli.h>
 #include <haproxy/fd.h>
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 0a12262c8b..b79db740a0 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/global.h>
+#include <haproxy/signal.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -23,7 +24,6 @@
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>
-#include <proto/signal.h>
 
 
 /* private data */
diff --git a/src/ev_evports.c b/src/ev_evports.c
index cfd053bb76..3d60247125 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -19,6 +19,7 @@
 #include <syslog.h>
 
 #include <haproxy/api.h>
+#include <haproxy/signal.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -28,7 +29,6 @@
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
-#include <proto/signal.h>
 
 /*
  * Private data:
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index a4c3bce990..e1d74d6b22 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -18,6 +18,7 @@
 #include <sys/time.h>
 
 #include <haproxy/api.h>
+#include <haproxy/signal.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -26,7 +27,6 @@
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>
-#include <proto/signal.h>
 
 
 /* private data */
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 6c0ef4e189..b086587892 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -18,6 +18,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/sample.h>
+#include <haproxy/signal.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/task.h>
@@ -37,7 +38,6 @@
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/session.h>
-#include <proto/signal.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index e85b9556fc..92fdd42266 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -100,6 +100,7 @@
 #include <haproxy/pattern.h>
 #include <haproxy/sample.h>
 #include <haproxy/regex.h>
+#include <haproxy/signal.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
@@ -132,7 +133,6 @@
 #include <proto/server.h>
 #include <proto/session.h>
 #include <proto/stream.h>
-#include <proto/signal.h>
 #include <proto/ssl_sock.h>
 
 /* array of init calls for older platforms */
diff --git a/src/mworker.c b/src/mworker.c
index 9e5b8260b5..eeedb4c705 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -22,18 +22,17 @@
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/mworker.h>
+#include <haproxy/signal.h>
 #include <haproxy/version.h>
 
 #include <types/cli.h>
 #include <haproxy/global.h>
 #include <types/peers.h>
-#include <types/signal.h>
 
 #include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/signal.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 
diff --git a/src/namespace.c b/src/namespace.c
index 616dbea118..dfda7a5e32 100644
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -14,8 +14,8 @@
 #include <haproxy/namespace.h>
 #include <haproxy/hash.h>
 #include <haproxy/errors.h>
+#include <haproxy/signal.h>
 #include <proto/log.h>
-#include <proto/signal.h>
 
 /* Opens the namespace <ns_name> and returns the FD or -1 in case of error
  * (check errno).
diff --git a/src/peers.c b/src/peers.c
index e1a2525a0c..c1c9588a9f 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -26,6 +26,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/task.h>
+#include <haproxy/signal.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread.h>
@@ -43,7 +44,6 @@
 #include <proto/proxy.h>
 #include <proto/session.h>
 #include <proto/stream.h>
-#include <proto/signal.h>
 #include <proto/stick_table.h>
 #include <proto/stream_interface.h>
 
diff --git a/src/proxy.c b/src/proxy.c
index 90fddd8be5..bb686e77ce 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -45,7 +45,7 @@
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/signal.h>
+#include <haproxy/signal.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 
diff --git a/src/signal.c b/src/signal.c
index 98ed9921dd..6d01548152 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include <haproxy/task.h>
-#include <proto/signal.h>
+#include <haproxy/signal.h>
 #include <proto/log.h>
 
 /* Principle : we keep an in-order list of the first occurrence of all received
diff --git a/src/sink.c b/src/sink.c
index aa346d841b..c4a452dcfa 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -26,7 +26,7 @@
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <haproxy/ring.h>
-#include <proto/signal.h>
+#include <haproxy/signal.h>
 #include <haproxy/sink.h>
 #include <proto/stream_interface.h>
 
diff --git a/src/wdt.c b/src/wdt.c
index 93b32248c5..3485c8f5ac 100644
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -17,7 +17,6 @@
 #include <haproxy/global.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <types/signal.h>
 #include <proto/log.h>