REORG: include: move istbuf.h to haproxy/
This one now relies on two files that were already cleaned up and is
only used by buffer.h.
diff --git a/include/common/buffer.h b/include/common/buffer.h
index 6e7adf4..2f5f882 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -30,7 +30,7 @@
#include <haproxy/buf.h>
#include <common/chunk.h>
#include <import/ist.h>
-#include <common/istbuf.h>
+#include <haproxy/istbuf.h>
#include <common/memory.h>
#include <proto/activity.h>
diff --git a/include/common/istbuf.h b/include/haproxy/istbuf.h
similarity index 95%
rename from include/common/istbuf.h
rename to include/haproxy/istbuf.h
index 074efe0..392ec46 100644
--- a/include/common/istbuf.h
+++ b/include/haproxy/istbuf.h
@@ -1,8 +1,8 @@
/*
- * include/common/istbuf.h
+ * include/haproxy/istbuf.h
* Functions used to manipulate indirect strings with wrapping buffers.
*
- * Copyright (C) 2000-2018 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -25,12 +25,12 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef _COMMON_ISTBUF_H
-#define _COMMON_ISTBUF_H
+#ifndef _HAPROXY_ISTBUF_H
+#define _HAPROXY_ISTBUF_H
-#include <inttypes.h>
-#include <haproxy/buf.h>
+#include <sys/types.h>
#include <import/ist.h>
+#include <haproxy/buf.h>
/* b_isteq() : returns > 0 if the first <n> characters of buffer <b> starting
@@ -152,7 +152,7 @@
return buf;
}
-#endif /* _COMMON_ISTBUF_H */
+#endif /* _HAPROXY_ISTBUF_H */
/*
* Local variables:
diff --git a/src/fcgi.c b/src/fcgi.c
index b2f6e42..8cfb6d0 100644
--- a/src/fcgi.c
+++ b/src/fcgi.c
@@ -26,6 +26,7 @@
#include <common/fcgi.h>
#include <haproxy/buf.h>
+#include <haproxy/istbuf.h>
/* Encodes header of a FCGI record into the chunk <out>. It returns non-zero on
* success and 0 on failure (buffer full). <out> is a chunk, so the wrapping is