diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:37:43 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:38:02 +0100 |
commit | 135ebe4f3d268121047fdbfee49f2dd52006165e (patch) | |
tree | 6b303103f36e69e29cfa860b8b7afc584c55d6f3 /src/3rdparty/pcre/pcre_chartables.c | |
parent | e7feb956280105113b3e58f12e5f32f54199a95a (diff) | |
parent | 1e8f50a8d069c97ea6a4f00d664c12e594884f54 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e
Diffstat (limited to 'src/3rdparty/pcre/pcre_chartables.c')
-rw-r--r-- | src/3rdparty/pcre/pcre_chartables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/pcre/pcre_chartables.c b/src/3rdparty/pcre/pcre_chartables.c index 89cc255a84..1e20ec29d0 100644 --- a/src/3rdparty/pcre/pcre_chartables.c +++ b/src/3rdparty/pcre/pcre_chartables.c @@ -20,7 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the header ensures that the array gets flagged as "someone outside this compilation unit might reference this" and so it will always be supplied to the linker. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif |