summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 04:07:07 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 04:07:07 +0000
commit27e211016b4dd484ac0a2ec8038ef60a59a07261 (patch)
tree52f5baf8892945442d2aabddb61ade0f0d153a37 /src/common
parent2be730b2cd3503eac660ae456e569cd3aa8c778a (diff)
downloadhercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.tar.gz
hercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.tar.bz2
hercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.tar.xz
hercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@830 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/malloc.c1
-rw-r--r--src/common/timer.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c
index dd1be030f..fad5183d1 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "malloc.h"
void* aMalloc_( size_t size, const char *file, int line, const char *func )
diff --git a/src/common/timer.c b/src/common/timer.c
index 49d205619..4c602b51e 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -114,6 +114,7 @@ unsigned int gettick(void)
*/
// デバッグ用関数群
+/*
static void dump_timer_heap(void) {
int j;
for(j = 1 ; j <= timer_heap[0] ; j++) {
@@ -128,6 +129,7 @@ static void dump_timer_heap(void) {
printf("%d : %d %d\n",j,timer_heap[j],timer_data[timer_heap[j]].tick);
}
}
+*/
static void push_timer_heap(int index)
{