REORG: include: move stream_interface.h to haproxy/stream_interface{,-t}.h
Almost no changes, removed stdlib and added buf-t and connection-t to
the types to avoid a warning.
diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index d77717a..f59cf0a 100644
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -32,7 +32,7 @@
#include <types/proxy.h>
#include <types/server.h>
#include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
static inline enum obj_type obj_type(const enum obj_type *t)
{
diff --git a/include/haproxy/stats.h b/include/haproxy/stats.h
index 7fb5775..b79e1ab 100644
--- a/include/haproxy/stats.h
+++ b/include/haproxy/stats.h
@@ -25,9 +25,9 @@
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
+#include <haproxy/stream_interface-t.h>
#include <haproxy/stats-t.h>
#include <haproxy/tools-t.h>
-#include <types/stream_interface.h>
/* These two structs contains all field names and descriptions according to
diff --git a/include/types/stream_interface.h b/include/haproxy/stream_interface-t.h
similarity index 96%
rename from include/types/stream_interface.h
rename to include/haproxy/stream_interface-t.h
index a60de10..e95c72d 100644
--- a/include/types/stream_interface.h
+++ b/include/haproxy/stream_interface-t.h
@@ -1,5 +1,5 @@
/*
- * include/types/stream_interface.h
+ * include/haproxy/stream_interface-t.h
* This file describes the stream_interface struct and associated constants.
*
* Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_STREAM_INTERFACE_H
-#define _TYPES_STREAM_INTERFACE_H
+#ifndef _HAPROXY_STREAM_INTERFACE_T_H
+#define _HAPROXY_STREAM_INTERFACE_T_H
#include <haproxy/api-t.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/connection-t.h>
#include <haproxy/obj_type-t.h>
/* A stream interface must have its own errors independently of the buffer's,
@@ -142,7 +144,7 @@
void (*shutw)(struct stream_interface *); /* shut write function, may not be null */
};
-#endif /* _TYPES_STREAM_INTERFACE_H */
+#endif /* _HAPROXY_STREAM_INTERFACE_T_H */
/*
* Local variables:
diff --git a/include/proto/stream_interface.h b/include/haproxy/stream_interface.h
similarity index 98%
rename from include/proto/stream_interface.h
rename to include/haproxy/stream_interface.h
index f17e6ae..7322dd1 100644
--- a/include/proto/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -1,5 +1,5 @@
/*
- * include/proto/stream_interface.h
+ * include/haproxy/stream_interface.h
* This file contains stream_interface function prototypes
*
* Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,17 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_STREAM_INTERFACE_H
-#define _PROTO_STREAM_INTERFACE_H
-
-#include <stdlib.h>
+#ifndef _HAPROXY_STREAM_INTERFACE_H
+#define _HAPROXY_STREAM_INTERFACE_H
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/connection.h>
-#include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
#include <proto/channel.h>
+#include <types/stream.h>
extern struct si_ops si_embedded_ops;
@@ -567,7 +565,7 @@
}
}
-#endif /* _PROTO_STREAM_INTERFACE_H */
+#endif /* _HAPROXY_STREAM_INTERFACE_H */
/*
* Local variables:
diff --git a/include/proto/channel.h b/include/proto/channel.h
index 96bf212..3ff81ad 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -32,12 +32,12 @@
#include <haproxy/dynbuf.h>
#include <haproxy/global.h>
#include <haproxy/htx.h>
+#include <haproxy/stream_interface-t.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
#include <types/channel.h>
#include <types/stream.h>
-#include <types/stream_interface.h>
#include <proto/stream.h>
#include <haproxy/task.h>
diff --git a/include/types/stream.h b/include/types/stream.h
index 0c1475f..a67d192 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -34,6 +34,7 @@
#include <haproxy/list-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/session-t.h>
+#include <haproxy/stream_interface-t.h>
#include <haproxy/vars-t.h>
#include <types/channel.h>
@@ -42,7 +43,6 @@
#include <types/proxy.h>
#include <types/queue.h>
#include <types/server.h>
-#include <types/stream_interface.h>
#include <haproxy/task-t.h>
#include <haproxy/stick_table-t.h>