REORG: include: move common/h2.h to haproxy/h2.h

No change was performed, the file is only included from C files and
currently doesn't need to be split into types+functions.

diff --git a/include/common/h2.h b/include/haproxy/h2.h
similarity index 99%
rename from include/common/h2.h
rename to include/haproxy/h2.h
index 751989d7f66e7b9b054b6973bc30fff83c435978..aa0edec93661eda17b54db6b32b24e9e6cc8f7b5 100644 (file)
--- a/include/common/h2.h
+++ b/include/haproxy/h2.h
@@ -1,5 +1,5 @@
 /*
- * include/common/h2.h
+ * include/haproxy/h2.h
  * This file contains types and macros used for the HTTP/2 protocol
  *
  * Copyright (C) 2000-2017 Willy Tarreau - w@1wt.eu
@@ -26,14 +26,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _COMMON_H2_H
-#define _COMMON_H2_H
+#ifndef _HAPROXY_H2_H
+#define _HAPROXY_H2_H
 
+#include <import/ist.h>
 #include <haproxy/api.h>
 #include <haproxy/http-hdr-t.h>
 #include <haproxy/htx-t.h>
-#include <import/ist.h>
-
 
 /* indexes of most important pseudo headers can be simplified to an almost
  * linear array by dividing the index by 2 for all values from 1 to 9, and
@@ -325,7 +324,7 @@ static inline const char *h2_phdr_to_str(int phdr)
        }
 }
 
-#endif /* _COMMON_H2_H */
+#endif /* _HAPROXY_H2_H */
 
 /*
  * Local variables:

diff --git a/src/h2.c b/src/h2.c
index 14eeabc2e71c497920ac4d64cc5539c26bb58468..7e5811346f40642ab90074a8d73ff4983b3eacf0 100644 (file)
--- a/src/h2.c
+++ b/src/h2.c
@@ -28,7 +28,7 @@
 #include <inttypes.h>
 #include <haproxy/api.h>
 #include <haproxy/http.h>
-#include <common/h2.h>
+#include <haproxy/h2.h>
 #include <haproxy/http-hdr-t.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>

diff --git a/src/hpack-dec.c b/src/hpack-dec.c
index 8f8e02bccef9c0bff813ca90c500df390e1b5813..e318ac3639a85eba526c676a34711ea45f897395 100644 (file)
--- a/src/hpack-dec.c
+++ b/src/hpack-dec.c
@@ -35,7 +35,7 @@
 #include <haproxy/hpack-huff.h>
 #include <haproxy/hpack-tbl.h>
 #include <haproxy/chunk.h>
-#include <common/h2.h>
+#include <haproxy/h2.h>
 #include <import/ist.h>
 
 #include <types/global.h>

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 4afaa29c53b25c1870a6f1eb6180bb7464fd834c..ef22ccee18a93c3e49c8532500438e7981b60eb9 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -13,7 +13,7 @@
 #include <haproxy/istbuf.h>
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
-#include <common/h2.h>
+#include <haproxy/h2.h>
 #include <haproxy/htx.h>
 
 #include <import/ebistree.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index adc789ad2e08d72d562eda21afbf0d142dbf797f..6ff41843813191a1a9ee139645631dcd6958e2d8 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -14,7 +14,7 @@
 #include <haproxy/istbuf.h>
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
-#include <common/h2.h>
+#include <haproxy/h2.h>
 #include <haproxy/hpack-dec.h>
 #include <haproxy/hpack-enc.h>
 #include <haproxy/hpack-tbl.h>