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/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/obj_type.h b/include/types/obj_type.h
deleted file mode 100644
index da3e735..0000000
--- a/include/types/obj_type.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * include/types/obj_type.h
- * This file declares some object types for use in various structures.
- *
- * Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, version 2.1
- * exclusively.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _TYPES_OBJ_TYPE_H
-#define _TYPES_OBJ_TYPE_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
- * structure holing the type, and this is used to retrieve the pointer to the
- * beginning of the structure. Doing so saves us from having to maintain both
- * a pointer and a type for elements such as connections which can point to
- * various types of objects.
- */
-
-/* object types : these ones take the same space as a char */
-enum obj_type {
- OBJ_TYPE_NONE = 0, /* pointer is NULL by definition */
- OBJ_TYPE_LISTENER, /* object is a struct listener */
- OBJ_TYPE_PROXY, /* object is a struct proxy */
- OBJ_TYPE_SERVER, /* object is a struct server */
- OBJ_TYPE_APPLET, /* object is a struct applet */
- OBJ_TYPE_APPCTX, /* object is a struct appctx */
- OBJ_TYPE_CONN, /* object is a struct connection */
- OBJ_TYPE_SRVRQ, /* object is a struct dns_srvrq */
- OBJ_TYPE_CS, /* object is a struct conn_stream */
- OBJ_TYPE_STREAM, /* object is a struct stream */
- OBJ_TYPE_CHECK, /* object is a struct check */
- OBJ_TYPE_ENTRIES /* last one : number of entries */
-} __attribute__((packed)) ;
-
-#endif /* _TYPES_OBJ_TYPE_H */
-
-/*
- * Local variables:
- * c-indent-level: 8
- * c-basic-offset: 8
- * End:
- */
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