Almost no change was needed; chunk.h was replaced with buf-t.h.
It dpeends on types/vars.h and types/protocol_buffers.h.
#include <types/global.h>
#include <types/stream.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/log.h>
#include <proto/spoe.h>
/*
- * 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>
* 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>
int line; /* line number where the args are referenced */
};
-#endif /* _TYPES_ARG_H */
+#endif /* _HAPROXY_ARG_T_H */
/*
* Local variables:
/*
- * 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>
* 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
char **err_msg, const char **end_ptr, int *err_arg,
struct arg_list *al);
-#endif /* _PROTO_ARG_H */
+#endif /* _HAPROXY_ARG_H */
/*
* Local variables:
#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>
#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>
#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>
#include <haproxy/http_htx.h>
#include <haproxy/thread.h>
#include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/http_fetch.h>
#include <proto/log.h>
#include <proto/http_ana.h>
#include <types/global.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/auth.h>
#include <proto/channel.h>
#include <proto/log.h>
#include <haproxy/tools.h>
#include <haproxy/chunk.h>
#include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
const char *arg_type_names[ARGT_NBTYPES] = {
[ARGT_STOP] = "end of arguments",
#include <types/global.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
#include <types/dns.h>
#include <types/stats.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/backend.h>
#include <proto/checks.h>
#include <proto/stats.h>
#include <haproxy/http.h>
#include <haproxy/http_htx.h>
#include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/http_fetch.h>
#include <proto/log.h>
#include <proto/http_ana.h>
#include <haproxy/pool.h>
#include <haproxy/time.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
#include <types/global.h>
#include <types/spoe.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/backend.h>
#include <proto/filters.h>
#include <haproxy/freq_ctr.h>
#include <types/global.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/channel.h>
#include <haproxy/fd.h>
#include <proto/frontend.h>
#include <proto/acl.h>
#include <haproxy/activity.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/auth.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <types/proxy.h>
#include <types/stats.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/applet.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <types/global.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/auth.h>
#include <proto/pattern.h>
#include <types/global.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/http_rules.h>
#include <proto/log.h>
#include <proto/http_ana.h>
#include <types/capture.h>
#include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/sample.h>
#include <proto/stream.h>
#include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/auth.h>
#include <proto/channel.h>
#include <proto/connection.h>
#include <haproxy/http_htx.h>
#include <haproxy/htx.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/http_fetch.h>
#include <proto/sample.h>
#include <types/global.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/http_rules.h>
#include <proto/http_ana.h>
#include <proto/sample.h>
#include <types/stats.h>
#include <proto/applet.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/cli.h>
#include <proto/log.h>
#include <proto/map.h>
#include <haproxy/net_helper.h>
#include <haproxy/htx.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/channel.h>
#include <proto/connection.h>
#include <proto/pattern.h>
#include <types/global.h>
#include <types/stream.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/channel.h>
#include <proto/connection.h>
#include <haproxy/fd.h>
#include <common/uri_auth.h>
#include <haproxy/base64.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/auth.h>
#include <proto/log.h>
#include <proto/proxy.h>
#include <types/ssl_sock.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/obj_type.h>
#include <proto/ssl_sock.h>
#include <proto/ssl_utils.h>
#include <types/stats.h>
#include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/channel.h>
#include <proto/connection.h>
#include <proto/cli.h>
#include <types/global.h>
#include <types/stats.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/cli.h>
#include <proto/http_rules.h>
#include <proto/log.h>
#include <proto/acl.h>
#include <haproxy/activity.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
#include <types/capture.h>
#include <types/connection.h>
#include <types/global.h>
#include <types/vars.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/http_rules.h>
#include <proto/http_ana.h>
#include <proto/sample.h>
#include <haproxy/errors.h>
#include <haproxy/http_htx.h>
#include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
#include <proto/log.h>
#include <proto/http_ana.h>
#include <proto/http_fetch.h>