diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-02-16 20:14:04 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-02-16 20:14:04 +0100 |
| commit | beee9b4a26419a6a40194c24a8c2abc2cfdd371e (patch) | |
| tree | 4cdde385c016e9bf0466ba6f732784ef79a7fc91 | |
| parent | Merge pull request #5811 from dslicenc/ipv6_ra_prefixes (diff) | |
| download | frr-beee9b4a26419a6a40194c24a8c2abc2cfdd371e.tar.xz frr-beee9b4a26419a6a40194c24a8c2abc2cfdd371e.zip | |
lib: Fix so that `--enable-pcreposix` actually compiles
The `--enable-pcreposix` configure option was not actually compiling
properly. Follow pre-existing pattern for inclusion of regex.h
or the pcreposix.h header.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | lib/frrstr.c | 4 | ||||
| -rw-r--r-- | lib/frrstr.h | 5 | ||||
| -rw-r--r-- | lib/vty.c | 5 | ||||
| -rw-r--r-- | lib/vty.h | 4 |
4 files changed, 18 insertions, 0 deletions
diff --git a/lib/frrstr.c b/lib/frrstr.c index 8a72a35af..7ef5fffd1 100644 --- a/lib/frrstr.c +++ b/lib/frrstr.c @@ -25,7 +25,11 @@ #include <string.h> #include <ctype.h> #include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include "frrstr.h" #include "memory.h" diff --git a/lib/frrstr.h b/lib/frrstr.h index 3a935c90c..441d7b867 100644 --- a/lib/frrstr.h +++ b/lib/frrstr.h @@ -22,7 +22,12 @@ #define _FRRSTR_H_ #include <sys/types.h> +#include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include <stdbool.h> #include "vector.h" @@ -23,7 +23,12 @@ #include <lib/version.h> #include <sys/types.h> +#include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include <stdio.h> #include "linklist.h" @@ -22,7 +22,11 @@ #define _ZEBRA_VTY_H #include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include "thread.h" #include "log.h" |