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

The file was moved as-is. There was a wrong dependency on dynbuf.h
instead of buf.h which was addressed. There was no benefit to
splitting this between types and functions.
This commit is contained in:
Willy Tarreau
2020-06-02 19:33:08 +02:00
parent 0017be0143
commit 5413a87ad3
11 changed files with 18 additions and 18 deletions

View File

@@ -1,8 +1,8 @@
/*
* include/common/h1.h
* include/haproxy/h1.h
* This file contains HTTP/1 protocol definitions.
*
* Copyright (C) 2000-2017 Willy Tarreau - w@1wt.eu
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _COMMON_H1_H
#define _COMMON_H1_H
#ifndef _HAPROXY_H1_H
#define _HAPROXY_H1_H
#include <import/ist.h>
#include <haproxy/api.h>
#include <haproxy/dynbuf.h>
#include <haproxy/intops.h>
#include <haproxy/buf.h>
#include <haproxy/http.h>
#include <haproxy/http-hdr-t.h>
#include <import/ist.h>
#include <haproxy/intops.h>
/* Possible states while parsing HTTP/1 messages (request|response) */
@@ -356,4 +356,4 @@ static inline struct h1m *h1m_init_res(struct h1m *h1m)
return h1m;
}
#endif /* _COMMON_H1_H */
#endif /* _HAPROXY_H1_H */

View File

@@ -25,7 +25,7 @@
#include <haproxy/buf.h>
#include <import/ist.h>
#include <common/h1.h>
#include <haproxy/h1.h>
int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl, struct htx *dsthtx,
struct buffer *srcbuf, size_t ofs, size_t max);