diff options
author | Haru <haru@dotalux.com> | 2016-02-06 18:13:03 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2016-02-06 18:51:22 +0100 |
commit | 8ca4506ee9ad4bfd490d1e9a7ab2cfb02f1ba3d7 (patch) | |
tree | 65d9aaa4c0c0695fe71c0aaa047d3eb4dafc49e0 /src/map | |
parent | 730fede2da1ca573ff716c77a5d9b1d0989adc6e (diff) | |
download | hercules-8ca4506ee9ad4bfd490d1e9a7ab2cfb02f1ba3d7.tar.gz hercules-8ca4506ee9ad4bfd490d1e9a7ab2cfb02f1ba3d7.tar.bz2 hercules-8ca4506ee9ad4bfd490d1e9a7ab2cfb02f1ba3d7.tar.xz hercules-8ca4506ee9ad4bfd490d1e9a7ab2cfb02f1ba3d7.zip |
Changed PCRE to properly use the system-provided pcre.h
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/npc.h | 5 | ||||
-rw-r--r-- | src/map/npc_chat.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 568ddfe87..be878933e 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -27,6 +27,8 @@ #include "common/hercules.h" #include "common/db.h" +#include <pcre.h> + struct hplugin_data_store; struct view_data; @@ -308,9 +310,6 @@ void npc_defaults(void); HPShared struct npc_interface *npc; -/* comes from npc_chat.c */ -#include <pcre/include/pcre.h> - /** * Structure containing all info associated with a single pattern block */ diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 001baf3ea..6726c65a9 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -31,8 +31,7 @@ #include "common/strlib.h" #include "common/timer.h" -#include <pcre/include/pcre.h> - +#include <pcre.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> |