summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-19 04:12:30 +0000
committerflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-19 04:12:30 +0000
commit44ce1e507f08e4d808dbae8abeb355e01de1819f (patch)
tree970bba91385573c664f0267e51aaf846d7d6710b /src/map
parentfcf74b22c8c1136a66c802e8067db74e25654f81 (diff)
downloadhercules-44ce1e507f08e4d808dbae8abeb355e01de1819f.tar.gz
hercules-44ce1e507f08e4d808dbae8abeb355e01de1819f.tar.bz2
hercules-44ce1e507f08e4d808dbae8abeb355e01de1819f.tar.xz
hercules-44ce1e507f08e4d808dbae8abeb355e01de1819f.zip
* Made NO_MEMMGR only be set as a default value, allowing for simultaneous use with the memory libraries.
* Moved memory library selection to malloc.c to avoid poisoning the namespace of the rest of the code. * Removed BCHECK code since it's unneeded. (bcheck is an external batch tool that runs on top of the dbx debugger) * Fixed GCOLLECT usage. (missing init and final memory leak check) * Fixed DMALLOC usage. (missing options on CYGWIN and verify memory) * Renamed malloc_verify to malloc_verify_ptr to avoid conflict with DMALLOC. * Changed itemtype from inline to static inline to avoid error with the SunOS compiler. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14913 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 071401acf..e0fb480a9 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -57,7 +57,7 @@ struct Clif_Config {
struct s_packet_db packet_db[MAX_PACKET_VER + 1][MAX_PACKET_DB + 1];
//Converts item type in case of pet eggs.
-inline int itemtype(int type)
+static inline int itemtype(int type)
{
return ( type == IT_PETEGG ) ? IT_WEAPON : type;
}