From: Thierry FOURNIER <tfournier@arpalert.org>
Date: Fri, 11 Sep 2015 06:33:33 +0000 (+0200)
Subject: MINOR: build: missing header
X-Git-Tag: v1.6-dev5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=007ff4ce0f87036dec2455995a1a14c8bf5214cd;p=thirdparty%2Fhaproxy.git

MINOR: build: missing header

Regex header file is missing in types/action.h

Repported by Conrad Hoffmann

I cannot build the current dev's master HEAD (ec3c37d) because of this error:

> In file included from include/proto/proto_http.h:26:0,
>                  from src/stick_table.c:26:
> include/types/action.h:102:20: error: field ‘re’ has incomplete type
>     struct my_regex re;    /* used by replace-header and replace-value */
>                     ^
> Makefile:771: recipe for target 'src/stick_table.o' failed
> make: *** [src/stick_table.o] Error 1

The struct act_rule defined in action.h includes a full struct my_regex
without #include-ing regex.h. Both gcc 5.2.0 and clang 3.6.2 do not allow this.
---

diff --git a/include/types/action.h b/include/types/action.h
index a1dd638d93..2461f79829 100644
--- a/include/types/action.h
+++ b/include/types/action.h
@@ -22,6 +22,8 @@
 #ifndef _TYPES_ACTION_H
 #define _TYPES_ACTION_H
 
+#include <common/regex.h>
+
 #include <types/stick_table.h>
 
 enum act_from {