diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-02-06 21:28:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-02-06 21:28:59 +0300 |
| commit | 02204cfb8310c3adea07b93ab200b0609f72f26c (patch) | |
| tree | cbe6b767c743d64faa493cd5a06e6f8c00d779ab /src | |
| parent | dfdf6b91839c88d9ca1071d63337d33757a87f4c (diff) | |
| parent | 2f4b1d7f15c8835545c791f09bac94bfae7e43b8 (diff) | |
| download | hercules-02204cfb8310c3adea07b93ab200b0609f72f26c.tar.gz hercules-02204cfb8310c3adea07b93ab200b0609f72f26c.tar.bz2 hercules-02204cfb8310c3adea07b93ab200b0609f72f26c.tar.xz hercules-02204cfb8310c3adea07b93ab200b0609f72f26c.zip | |
Merge pull request #1143 from MishimaHaruna/usrlocal
Improved ./configure on systems that rely on /usr/local
Diffstat (limited to 'src')
| -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> |