diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 18:42:53 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 18:42:53 +0000 |
| commit | 90fd7a2c221c9e13a43d2c01e3af53c04e393945 (patch) | |
| tree | 130cfcc656939ca5103deec186ee32bf7888344e /src | |
| parent | 1a348ede4934a1ba78f337ee1dffe11a699f4bef (diff) | |
| download | hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.tar.gz hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.tar.bz2 hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.tar.xz hercules-90fd7a2c221c9e13a43d2c01e3af53c04e393945.zip | |
G++ is now the default on trunk [MouseJstr]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1443 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/.svnignore | 2 | ||||
| -rw-r--r-- | src/common/dll.h | 50 | ||||
| -rw-r--r-- | src/map/.svnignore | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/npc_chat.c | 2 |
5 files changed, 32 insertions, 27 deletions
diff --git a/src/common/.svnignore b/src/common/.svnignore new file mode 100644 index 000000000..fbbf39b06 --- /dev/null +++ b/src/common/.svnignore @@ -0,0 +1,2 @@ +GNUmakefile +obj diff --git a/src/common/dll.h b/src/common/dll.h index 50854da4d..1ad49143c 100644 --- a/src/common/dll.h +++ b/src/common/dll.h @@ -1,25 +1,25 @@ -
-#ifndef _DLL_H_
-#define _DLL_H_
-
-#ifdef _WIN32
-
- #include <windows.h>
- #define DLL_OPEN(x) LoadLibrary(x)
- #define DLL_SYM(x,y,z) (FARPROC)(x) = GetProcAddress(y,z)
- #define DLL_CLOSE(x) FreeLibrary(x)
- #define DLL HINSTANCE
-
-#else
-
- #include <dlfcn.h>
- #define DLL_OPEN(x) dlopen(x,RTLD_NOW)
- #define DLL_SYM(x,y,z) (x) = (void *)dlsym(y,z)
- #define DLL_CLOSE(x) dlclose(x)
- #define DLL void *
-
-#endif
-
-#endif // _DLL_H_
-
-
+ +#ifndef _DLL_H_ +#define _DLL_H_ + +#ifdef _WIN32 + + #include <windows.h> + #define DLL_OPEN(x) LoadLibrary(x) + #define DLL_SYM(x,y,z) (FARPROC)(x) = GetProcAddress(y,z) + #define DLL_CLOSE(x) FreeLibrary(x) + #define DLL HINSTANCE + +#else + + #include <dlfcn.h> + #define DLL_OPEN(x) dlopen(x,RTLD_NOW) + #define DLL_SYM(x,y,z) (x) = (void *)dlsym(y,z) + #define DLL_CLOSE(x) dlclose(x) + #define DLL void * + +#endif + +#endif // _DLL_H_ + + diff --git a/src/map/.svnignore b/src/map/.svnignore new file mode 100644 index 000000000..d2a881f54 --- /dev/null +++ b/src/map/.svnignore @@ -0,0 +1,3 @@ +txtobj +GNUmakefile +sqlobj diff --git a/src/map/clif.c b/src/map/clif.c index c8f190c5a..70d7cdaa9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8007,7 +8007,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c < WFIFOSET(fd, WFIFOW(fd,2)); #ifdef PCRE_SUPPORT - map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen(RFIFOP(fd,4)), &sd->bl); + map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen((char *) RFIFOP(fd,4)), &sd->bl); #endif // Celest diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 5ec8540ae..c15a26bf0 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -387,7 +387,7 @@ int npc_chat_sub(struct block_list *bl, va_list ap) int offsets[20]; char buf[255]; // perform pattern match - int r = pcre_exec(e->pcre_, e->pcre_extra_, msg, len, 0, + int r = pcre_exec(e->pcre_, e->pcre_extra_, (char *) msg, len, 0, 0, offsets, sizeof(offsets) / sizeof(offsets[0])); if (r >= 0) { // save out the matched strings |