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

No change was necessary. It still includes lots of types/* files.

diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index 62e8b7fa80dca4358ea0165f998ff76d6db2a5dc..fe3938a8ca260b8dd95a8fa350f223cb530fe6ba 100644 (file)
--- 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>

diff --git a/include/types/obj_type.h b/include/haproxy/obj_type-t.h
similarity index 94%
rename from include/types/obj_type.h
rename to include/haproxy/obj_type-t.h
index da3e735ba079f07a534a5210a8454337e40c0562..095a4f9118f7ad5dc31213691312aee696e153ea 100644 (file)
--- a/include/types/obj_type.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:

diff --git a/include/proto/obj_type.h b/include/haproxy/obj_type.h
similarity index 97%
rename from include/proto/obj_type.h
rename to include/haproxy/obj_type.h
index 402d08413e8a835d080eb4f4f6aa431ed77bf2e2..42235c6e8f3de078820259a11e91646d5299384d 100644 (file)
--- a/include/proto/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:

diff --git a/include/proto/connection.h b/include/proto/connection.h
index 9cf1aaaad4f26dc8655ce154a1192c1764b26164..f6ea74cb390dda3ba3002f2ee608b9a2c4bb3c1f 100644 (file)
--- 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>
 

diff --git a/include/proto/session.h b/include/proto/session.h
index a52e982c9c32a2a980a227631dd53ed7b5d00d37..8a17ad91d4df63bd41b1869fd6343c22064f4619 100644 (file)
--- 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>
 

diff --git a/include/proto/stream.h b/include/proto/stream.h
index bc93a2bc41ccc9fe9f43a898a492de44c2e8b12b..1c0fd4547899cd3356654e53847211efad95ea46 100644 (file)
--- 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>

diff --git a/include/types/applet.h b/include/types/applet.h
index a67827bd2f32feca6258e2e20d56d8d150d222e4..c32dd8eda4fb6b18004d216f7c70f1f82cd141fb 100644 (file)
--- 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>
 

diff --git a/include/types/checks.h b/include/types/checks.h
index 075e9022f2206bde4af3e3a62122c98de7fb4500..80f6321f2df12bb8f6bd9c8046884fce5b19b607 100644 (file)
--- 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>

diff --git a/include/types/connection.h b/include/types/connection.h
index 55f136f78c5c1f6df9e699f48b16025a35ac529d..d324567c70f6f587a524599feb2a445b959ce910 100644 (file)
--- 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>
 

diff --git a/include/types/listener.h b/include/types/listener.h
index fddabb46f0425592504aaf0d1f4ab0ba719220b4..52df218433ee9c17deb1a808dc6ab34e1d1170f9 100644 (file)
--- 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 */

diff --git a/include/types/proxy.h b/include/types/proxy.h
index 75f02975b528dab3e711eee06b38eddaef9c4df9..362b62edb2b47879358715198d716209e039798e 100644 (file)
--- 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>

diff --git a/include/types/server.h b/include/types/server.h
index c0f6c38ae5c493ae29dba87938a578b797a2c2a1..e74a26814923123bc3cee15fea8416285daaa7ff 100644 (file)
--- 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>

diff --git a/include/types/session.h b/include/types/session.h
index 57ee52ab8436c66cdac1c658ad0783e070556627..66911f3d6932e26bcd81fba9b8b84428c5186ecc 100644 (file)
--- 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>

diff --git a/include/types/stream.h b/include/types/stream.h
index c7db75e25358d3e053cdf88abb95a4976a019f23..e86b6d6141c85d60c78c2c52f3e7ac41f21d47b2 100644 (file)
--- 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>

diff --git a/include/types/stream_interface.h b/include/types/stream_interface.h
index 4c69d2dd9a54a8cba37a4850e4765254e36ac7fd..a60de10b6ef17239ae6954a74049d04f6b695e33 100644 (file)
--- 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

diff --git a/src/action.c b/src/action.c
index 63c1188d7eda3a2e941bd15aadd85d869e60003c..a7f1b7e3bcb6f2420fe9be60cfc408ee67f053a6 100644 (file)
--- 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>

diff --git a/src/backend.c b/src/backend.c
index cab39c898d87b0804ba2ac79d37c774d63aad50f..8567135458b95fa6c4e1ea204f4e2cb9e9dbe962 100644 (file)
--- 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>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index e1d2394cfbb6535aa0cbd5f2d96b03a0b7696ec0..621883a4094b569ef3790ef51d3c518f37496be5 100644 (file)
--- 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>
 

diff --git a/src/hlua.c b/src/hlua.c
index d0d6282de6dfcf87d4ccdcb4bd73efb32c31336a..a795935f0ae94d92ac4a0665d9ff032c058a9c0e 100644 (file)
--- 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>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index c14b95bd41bc59edbb1868a3669c540808d775cf..e85978bad276c145c8bd1d6eecb3d672aff422f5 100644 (file)
--- 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>

diff --git a/src/peers.c b/src/peers.c
index f4513a5d644886f72161eec0b7792b98e6f33351..62536043151ee5c484ab0b89dfbd1619c9d40c68 100644 (file)
--- 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>
 

diff --git a/src/proxy.c b/src/proxy.c
index 3f889c264c4964d1dfbcd6a28f376a8dab601e74..43ae7cf9658c2226990c1a970b74242ce3867509 100644 (file)
--- 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>
 

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 8eb958b8e2d2c6db9e90287ae166d90647bc428d..5462dba54cea9d75f8539a1c8a53ed671ca7eef9 100644 (file)
--- 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>