REORG: include: move payload.h to haproxy/payload.h

There's no type file, it only contains fetch_rdp_cookie_name() and
val_payload_lv() which probably ought to move somewhere else instead
of staying there.

diff --git a/include/proto/payload.h b/include/haproxy/payload.h
similarity index 89%
rename from include/proto/payload.h
rename to include/haproxy/payload.h
index 481b613b2aba3b7bd10e8373b7ff4c29af158b39..a99adf0ca981e983ff2cb6eaf8f9ec1dcc2399eb 100644 (file)
--- a/include/proto/payload.h
+++ b/include/haproxy/payload.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/payload.h
+ * include/haproxy/payload.h
  * Definitions for payload-based sample fetches and ACLs
  *
  * 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 _PROTO_PROTO_PAYLOAD_H
-#define _PROTO_PROTO_PAYLOAD_H
+#ifndef _HAPROXY_PAYLOAD_H
+#define _HAPROXY_PAYLOAD_H
 
 #include <haproxy/api.h>
 #include <types/sample.h>
@@ -29,7 +29,7 @@
 int fetch_rdp_cookie_name(struct stream *s, struct sample *smp, const char *cname, int clen);
 int val_payload_lv(struct arg *arg, char **err_msg);
 
-#endif /* _PROTO_PROTO_PAYLOAD_H */
+#endif /* _HAPROXY_PAYLOAD_H */
 
 /*
  * Local variables:

diff --git a/src/backend.c b/src/backend.c
index 0d18e15f31e0f99fb8eb9134ee98f6718b815ac0..6c6c26d81b9b788a4b1d4bf109a5c57a2fb0501d 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -30,6 +30,7 @@
 #include <haproxy/lb_fwlc.h>
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/obj_type.h>
+#include <haproxy/payload.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
@@ -43,7 +44,6 @@
 #include <proto/checks.h>
 #include <proto/lb_map.h>
 #include <proto/log.h>
-#include <proto/payload.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
 #include <proto/proto_tcp.h>

diff --git a/src/hlua.c b/src/hlua.c
index a2743f9c8d8268a1ef66352a2c5946dd1682ffb0..69d84bd6bb8b01d07570b0611e6f2e3d35710827 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -36,6 +36,7 @@
 #include <haproxy/map.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pattern.h>
+#include <haproxy/payload.h>
 #include <haproxy/tools.h>
 
 #include <types/cli.h>
@@ -50,7 +51,6 @@
 #include <proto/stats.h>
 #include <proto/http_fetch.h>
 #include <proto/queue.h>
-#include <proto/payload.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
 #include <proto/server.h>

diff --git a/src/payload.c b/src/payload.c
index eaf8f06e51db2c612d0fdcf38aa744252ee7c904..3d176d6632bde4960e942616b27a44bb9d2c2795 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -15,13 +15,13 @@
 
 #include <haproxy/api.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/payload.h>
 #include <haproxy/pattern.h>
 #include <haproxy/htx.h>
 #include <proto/acl.h>
 #include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
-#include <proto/payload.h>
 #include <proto/sample.h>
 #include <proto/http_ana.h>