diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-08 19:47:26 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-08 19:47:26 +0000 |
| commit | 6fc804e12ad7db569e82229cc11a361066cec682 (patch) | |
| tree | ddfdf820c20e373e6666b6ae4428099702b47744 /src/map/npc_chat.c | |
| parent | 49a1de65bf592bbfe194a06b2b4c41f9865ea8b3 (diff) | |
| download | hercules-6fc804e12ad7db569e82229cc11a361066cec682.tar.gz hercules-6fc804e12ad7db569e82229cc11a361066cec682.tar.bz2 hercules-6fc804e12ad7db569e82229cc11a361066cec682.tar.xz hercules-6fc804e12ad7db569e82229cc11a361066cec682.zip | |
* Fix C++ compilation issues.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14955 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc_chat.c')
| -rw-r--r-- | src/map/npc_chat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 99fa40a20..77c875a7e 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -73,8 +73,8 @@ struct pcrematch_entry { struct pcrematch_entry* next; char* pattern; - pcre* pcre; - pcre_extra* pcre_extra; + pcre* pcre_; + pcre_extra* pcre_extra_; char* label; }; @@ -108,8 +108,8 @@ struct npc_parse { */ void finalize_pcrematch_entry(struct pcrematch_entry* e) { - pcre_free(e->pcre); - pcre_free(e->pcre_extra); + pcre_free(e->pcre_); + pcre_free(e->pcre_extra_); aFree(e->pattern); aFree(e->label); } @@ -316,8 +316,8 @@ void npc_chat_def_pattern(struct npc_data* nd, int setid, const char* pattern, c struct pcrematch_entry *e = create_pcrematch_entry(s); e->pattern = aStrdup(pattern); e->label = aStrdup(label); - e->pcre = pcre_compile(pattern, PCRE_CASELESS, &err, &erroff, NULL); - e->pcre_extra = pcre_study(e->pcre, 0, &err); + e->pcre_ = pcre_compile(pattern, PCRE_CASELESS, &err, &erroff, NULL); + e->pcre_extra_ = pcre_study(e->pcre_, 0, &err); } /** @@ -373,7 +373,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap) int offsets[2*10 + 10]; // 1/3 reserved for temp space requred by pcre_exec // perform pattern match - int r = pcre_exec(e->pcre, e->pcre_extra, msg, len, 0, 0, offsets, ARRAYLENGTH(offsets)); + int r = pcre_exec(e->pcre_, e->pcre_extra_, msg, len, 0, 0, offsets, ARRAYLENGTH(offsets)); if (r > 0) { // save out the matched strings |