REORG: include: move arg.h to haproxy/arg{,-t}.h
Almost no change was needed; chunk.h was replaced with buf-t.h.
It dpeends on types/vars.h and types/protocol_buffers.h.
diff --git a/include/types/arg.h b/include/haproxy/arg-t.h
similarity index 96%
rename from include/types/arg.h
rename to include/haproxy/arg-t.h
index 6cd739f..1a4208d 100644
--- a/include/types/arg.h
+++ b/include/haproxy/arg-t.h
@@ -1,5 +1,5 @@
/*
- * include/types/arg.h
+ * include/haproxy/arg-t.h
* This file contains structure declarations for generaic argument parsing.
*
* Copyright 2012 Willy Tarreau <w@1wt.eu>
@@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_ARG_H
-#define _TYPES_ARG_H
+#ifndef _HAPROXY_ARG_T_H
+#define _HAPROXY_ARG_T_H
#include <sys/socket.h>
#include <netinet/in.h>
-#include <haproxy/chunk.h>
+#include <haproxy/buf-t.h>
#include <haproxy/list-t.h>
#include <types/vars.h>
@@ -133,7 +133,7 @@
int line; /* line number where the args are referenced */
};
-#endif /* _TYPES_ARG_H */
+#endif /* _HAPROXY_ARG_T_H */
/*
* Local variables:
diff --git a/include/proto/arg.h b/include/haproxy/arg.h
similarity index 96%
rename from include/proto/arg.h
rename to include/haproxy/arg.h
index 884e5bb..1817dae 100644
--- a/include/proto/arg.h
+++ b/include/haproxy/arg.h
@@ -1,5 +1,5 @@
/*
- * include/proto/arg.h
+ * include/haproxy/arg.h
* This file contains functions and macros declarations for generic argument parsing.
*
* Copyright 2012 Willy Tarreau <w@1wt.eu>
@@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_ARG_H
-#define _PROTO_ARG_H
+#ifndef _HAPROXY_ARG_H
+#define _HAPROXY_ARG_H
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
/* Some macros used to build some arg list. We can declare various argument
* combinations from 0 to 7 args using a single 32-bit integer. The first
@@ -83,7 +83,7 @@
char **err_msg, const char **end_ptr, int *err_arg,
struct arg_list *al);
-#endif /* _PROTO_ARG_H */
+#endif /* _HAPROXY_ARG_H */
/*
* Local variables:
diff --git a/include/proto/http_fetch.h b/include/proto/http_fetch.h
index 8df991c..e631bc0 100644
--- a/include/proto/http_fetch.h
+++ b/include/proto/http_fetch.h
@@ -24,7 +24,7 @@
#include <haproxy/api.h>
#include <haproxy/htx.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
#include <types/channel.h>
#include <types/checks.h>
#include <types/sample.h>
diff --git a/include/proto/protocol_buffers.h b/include/proto/protocol_buffers.h
index 0426d83..3e1571a 100644
--- a/include/proto/protocol_buffers.h
+++ b/include/proto/protocol_buffers.h
@@ -23,7 +23,7 @@
#define _PROTO_PROTOCOL_BUFFERS_H
#include <inttypes.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
#include <types/protocol_buffers.h>
#include <proto/sample.h>
diff --git a/include/types/acl.h b/include/types/acl.h
index 7afa3d8..89c3c93 100644
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -25,7 +25,7 @@
#include <haproxy/api-t.h>
#include <haproxy/list-t.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
#include <types/auth.h>
#include <types/pattern.h>
#include <types/proxy.h>