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

No change was necessary. It still includes lots of types/* files.
2025-03-05 19:10:45 +00:00 · 2020-06-04 11:29:21 +02:00 · 2020-06-04 11:29:21 +02:00 · 8efbdfb77b
commit 8efbdfb77b
parent 762d7a5117
23 changed files with 31 additions and 31 deletions
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@ -24,11 +24,11 @@

 #include <import/eb32tree.h>

+#include <haproxy/obj_type-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread.h>

 #include <types/connection.h>
-#include <types/obj_type.h>
 #include <haproxy/proto_udp-t.h>
 #include <types/proxy.h>
 #include <types/server.h>
--- a/include/haproxy/obj_type-t.h
+++ b/include/haproxy/obj_type-t.h
@ -1,5 +1,5 @@
 /*
- * include/types/obj_type.h
+ * include/haproxy/obj_type-t.h
 * This file declares some object types for use in various structures.
 *
 * Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef _TYPES_OBJ_TYPE_H
-#define _TYPES_OBJ_TYPE_H
+#ifndef _HAPROXY_OBJ_TYPE_T_H
+#define _HAPROXY_OBJ_TYPE_T_H

 /* The principle is to be able to change the type of a pointer by pointing
 * it directly to an object type. The object type indicates the format of the
@ -46,7 +46,7 @@ enum obj_type {
 	OBJ_TYPE_ENTRIES       /* last one : number of entries */
 } __attribute__((packed)) ;

-#endif /* _TYPES_OBJ_TYPE_H */
+#endif /* _HAPROXY_OBJ_TYPE_T_H */

 /*
 * Local variables:
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@ -1,5 +1,5 @@
 /*
- * include/proto/obj_type.h
+ * include/haproxy/obj_type.h
 * This file contains function prototypes to manipulate object types
 *
 * Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
@ -19,15 +19,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef _PROTO_OBJ_TYPE_H
-#define _PROTO_OBJ_TYPE_H
+#ifndef _HAPROXY_OBJ_TYPE_H
+#define _HAPROXY_OBJ_TYPE_H

 #include <haproxy/api.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
 #include <types/applet.h>
 #include <types/connection.h>
 #include <types/listener.h>
-#include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/server.h>
 #include <types/stream.h>
@ -204,7 +204,7 @@ static inline void *obj_base_ptr(enum obj_type *t)
 	}
 }

-#endif /* _PROTO_OBJ_TYPE_H */
+#endif /* _HAPROXY_OBJ_TYPE_H */

 /*
 * Local variables:
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@ -22,13 +22,13 @@
 #ifndef _PROTO_CONNECTION_H
 #define _PROTO_CONNECTION_H

-#include <haproxy/api.h>
 #include <import/ist.h>
+#include <haproxy/api.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <types/connection.h>
 #include <types/listener.h>
 #include <haproxy/fd.h>
-#include <proto/obj_type.h>
 #include <proto/session.h>
 #include <proto/task.h>

--- a/include/proto/session.h
+++ b/include/proto/session.h
@ -23,12 +23,12 @@
 #define _PROTO_SESSION_H

 #include <haproxy/api.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/pool.h>

 #include <types/global.h>
 #include <types/session.h>

-#include <proto/obj_type.h>
 #include <proto/stick_table.h>
 #include <proto/server.h>

--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@ -28,7 +28,7 @@
 #include <types/stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/obj_type.h>
+#include <haproxy/obj_type.h>
 #include <proto/queue.h>
 #include <proto/stick_table.h>
 #include <proto/task.h>
--- a/include/types/applet.h
+++ b/include/types/applet.h
@ -27,8 +27,8 @@
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/hlua-t.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/xref-t.h>
-#include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/stream.h>

--- a/include/types/checks.h
+++ b/include/types/checks.h
@ -18,11 +18,11 @@

 #include <import/ist.h>
 #include <haproxy/list-t.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/regex-t.h>
 #include <haproxy/buf-t.h>

 #include <types/connection.h>
-#include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/sample.h>
 #include <types/server.h>
--- a/include/types/connection.h
+++ b/include/types/connection.h
@ -29,7 +29,7 @@
 #include <import/ist.h>

 #include <types/listener.h>
-#include <types/obj_type.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/port_range-t.h>
 #include <haproxy/protocol-t.h>

--- a/include/types/listener.h
+++ b/include/types/listener.h
@ -31,9 +31,9 @@
 #endif

 #include <haproxy/list-t.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>

-#include <types/obj_type.h>
 #include <import/eb32tree.h>

 /* Some pointer types reference below */
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@ -32,6 +32,7 @@
 #include <haproxy/counters-t.h>
 #include <haproxy/http-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>

 #include <import/eb32tree.h>
@ -44,7 +45,6 @@
 #include <haproxy/freq_ctr-t.h>
 #include <types/listener.h>
 #include <types/log.h>
-#include <types/obj_type.h>
 #include <types/sample.h>
 #include <types/server.h>
 #include <types/stick_table.h>
--- a/include/types/server.h
+++ b/include/types/server.h
@ -29,6 +29,7 @@
 #include <haproxy/dns-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/openssl-compat.h>

@ -36,7 +37,6 @@

 #include <types/connection.h>
 #include <haproxy/freq_ctr-t.h>
-#include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/ssl_sock.h>
--- a/include/types/session.h
+++ b/include/types/session.h
@ -30,8 +30,8 @@

 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/obj_type-t.h>

-#include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/stick_table.h>
 #include <types/task.h>
--- a/include/types/stream.h
+++ b/include/types/stream.h
@ -32,10 +32,10 @@
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/obj_type-t.h>

 #include <types/channel.h>
 #include <types/filters.h>
-#include <types/obj_type.h>
 #include <types/http_ana.h>
 #include <types/proxy.h>
 #include <types/queue.h>
--- a/include/types/stream_interface.h
+++ b/include/types/stream_interface.h
@ -23,7 +23,7 @@
 #define _TYPES_STREAM_INTERFACE_H

 #include <haproxy/api-t.h>
-#include <types/obj_type.h>
+#include <haproxy/obj_type-t.h>

 /* A stream interface must have its own errors independently of the buffer's,
 * so that applications can rely on what the buffer reports while the stream
--- a/src/action.c
+++ b/src/action.c
@ -12,12 +12,12 @@

 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>

 #include <proto/log.h>
-#include <proto/obj_type.h>
 #include <proto/proxy.h>
 #include <proto/stick_table.h>
 #include <proto/task.h>
--- a/src/backend.c
+++ b/src/backend.c
@ -25,6 +25,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
@ -43,7 +44,6 @@
 #include <proto/lb_map.h>
 #include <proto/log.h>
 #include <proto/mux_pt.h>
-#include <proto/obj_type.h>
 #include <proto/payload.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@ -43,6 +43,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
 #include <haproxy/mailers-t.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@ -52,7 +53,6 @@

 #include <types/filters.h>
 #include <types/global.h>
-#include <types/obj_type.h>
 #include <types/peers.h>
 #include <types/stats.h>

--- a/src/hlua.c
+++ b/src/hlua.c
@ -32,6 +32,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/tools.h>

 #include <types/cli.h>
@ -47,7 +48,6 @@
 #include <proto/http_fetch.h>
 #include <proto/http_rules.h>
 #include <proto/map.h>
-#include <proto/obj_type.h>
 #include <proto/queue.h>
 #include <proto/pattern.h>
 #include <proto/payload.h>
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@ -25,6 +25,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
@ -36,7 +37,6 @@
 #include <proto/connection.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>
-#include <proto/obj_type.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
 #include <proto/stream.h>
--- a/src/peers.c
+++ b/src/peers.c
@ -24,13 +24,13 @@
 #include <haproxy/dict.h>
 #include <haproxy/frontend.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread.h>

 #include <types/global.h>
 #include <types/listener.h>
-#include <types/obj_type.h>
 #include <types/peers.h>
 #include <types/stats.h>

--- a/src/proxy.c
+++ b/src/proxy.c
@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
 #include <haproxy/time.h>

@ -29,7 +30,6 @@
 #include <haproxy/capture-t.h>
 #include <types/cli.h>
 #include <types/global.h>
-#include <types/obj_type.h>
 #include <types/peers.h>
 #include <types/stats.h>

--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@ -22,6 +22,7 @@

 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
+#include <haproxy/obj_type.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/tools.h>

@ -30,7 +31,6 @@

 #include <proto/acl.h>
 #include <haproxy/arg.h>
-#include <proto/obj_type.h>
 #include <proto/ssl_sock.h>
 #include <proto/ssl_utils.h>
 #include <proto/sample.h>