summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-10-19 20:23:22 +0200
committerHaruna <haru@dotalux.com>2015-10-19 20:23:22 +0200
commitcffb68c6ee66227327e128f86cde8aa843e273d6 (patch)
tree3a8fb83f5c01ff26fa2efb53377f4255d093b00b /src/plugins
parentb320fdc7451c8643971a8b17c84ec777f9d7ecdf (diff)
parente625d7f186f104316031a39438bf644c67b1f4c4 (diff)
downloadhercules-cffb68c6ee66227327e128f86cde8aa843e273d6.tar.gz
hercules-cffb68c6ee66227327e128f86cde8aa843e273d6.tar.bz2
hercules-cffb68c6ee66227327e128f86cde8aa843e273d6.tar.xz
hercules-cffb68c6ee66227327e128f86cde8aa843e273d6.zip
Merge pull request #804 from 4144/memmanager
Fix reallocating memory without memory manager.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/HPMHooking.c4
-rw-r--r--src/plugins/db2sql.c2
-rw-r--r--src/plugins/sample.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c
index e5483da5b..a975c034e 100644
--- a/src/plugins/HPMHooking.c
+++ b/src/plugins/HPMHooking.c
@@ -4,7 +4,7 @@
#include "common/hercules.h"
#include "common/db.h"
-#include "common/malloc.h"
+#include "common/memmgr.h"
#include "common/mmo.h"
#include "common/socket.h"
@@ -89,7 +89,7 @@
#include "common/conf.h"
#include "common/console.h"
#include "common/db.h"
-#include "common/malloc.h"
+#include "common/memmgr.h"
#include "common/nullpo.h"
#include "common/showmsg.h"
#include "common/socket.h"
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index 79eda0e5e..50781f319 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -6,7 +6,7 @@
#include "common/hercules.h"
#include "common/cbasetypes.h"
#include "common/conf.h"
-#include "common/malloc.h"
+#include "common/memmgr.h"
#include "common/mmo.h"
#include "common/strlib.h"
#include "common/timer.h"
diff --git a/src/plugins/sample.c b/src/plugins/sample.c
index 275edb129..fea25514b 100644
--- a/src/plugins/sample.c
+++ b/src/plugins/sample.c
@@ -3,7 +3,7 @@
// Sample Hercules Plugin
#include "common/hercules.h" /* Should always be the first Hercules file included! (if you don't make it first, you won't be able to use interfaces) */
-#include "common/malloc.h"
+#include "common/memmgr.h"
#include "common/mmo.h"
#include "common/socket.h"
#include "common/strlib.h"