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 62e8b7f..fe3938a 100644
--- 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 93%
rename from include/types/obj_type.h
rename to include/haproxy/obj_type-t.h
index da3e735..095a4f9 100644
--- 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 @@
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 96%
rename from include/proto/obj_type.h
rename to include/haproxy/obj_type.h
index 402d084..42235c6 100644
--- 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 @@
}
}
-#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 9cf1aaa..f6ea74c 100644
--- 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 a52e982..8a17ad9 100644
--- 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 bc93a2b..1c0fd45 100644
--- 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 a67827b..c32dd8e 100644
--- 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 075e902..80f6321 100644
--- 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 55f136f..d324567 100644
--- 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 fddabb4..52df218 100644
--- 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 75f0297..362b62e 100644
--- 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 c0f6c38..e74a268 100644
--- 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 57ee52a..66911f3 100644
--- 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 c7db75e..e86b6d6 100644
--- 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 4c69d2d..a60de10 100644
--- 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