RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-13 15:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: cache: avoid a build warning with some compilers/linkers

Browse Source 
The struct http_cache_applet was fully declared at the beginning
instead of just doing a forward declaration using an extern modifier.
Some linkers report warnings about a redefined symbol since these
really are two complete declarations.

The proper way to do this is to use extern on the first one and to
have a full declaration later. However it's not permitted to have
both static and extern so the change done in commit 0f2229943
("CLEANUP: cache: don't export http_cache_applet anymore") has to
be partially undone.

This should be backported to 1.9 for sanity but has no effet on
most platforms. However on 1.9 the extern keyword must also be
added to include/types/cache.h.
This commit is contained in:
Willy Tarreau 2019-03-29 18:26:52 +01:00
parent 72d9f3351d
commit 2231b63887
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cache.c
View File

@ -48,7 +48,7 @@
const char *cache_store_flt_id = "cache store filter";
static struct applet http_cache_applet;
extern struct applet http_cache_applet;
struct flt_ops cache_ops;
@ -1839,7 +1839,7 @@ static struct action_kw_list http_req_actions = {
INITCALL1(STG_REGISTER, http_req_keywords_register, &http_req_actions);
static struct applet http_cache_applet = {
struct applet http_cache_applet = {
.obj_type = OBJ_TYPE_APPLET,
.name = "<CACHE>", /* used for logging */
.fct = http_cache_io_handler,