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.
This commit is contained in:
Willy Tarreau 2020-06-03 12:04:01 +02:00
parent be327fa332
commit bf0731491b
5 changed files with 9 additions and 10 deletions

View File

@ -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:

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>