From c3fe5f43ebce077d8711fe7ba4a30cb78dea2d38 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 27 Mar 2007 07:41:05 +0000
Subject: - Removed a missing file reference in the athena-start script - Fixed
 a #error "<malloc.h> has been replaced by <stdlib.h>" problem - Fixed the
 msg_silent setting not being announced every time

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10077 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/tool/Makefile   | 2 +-
 src/tool/convert.c  | 3 ++-
 src/tool/grfio.c    | 1 -
 src/tool/mapcache.c | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/tool')

diff --git a/src/tool/Makefile b/src/tool/Makefile
index 415606525..286b839f3 100644
--- a/src/tool/Makefile
+++ b/src/tool/Makefile
@@ -12,4 +12,4 @@ mapcache:
 	$(CC) -o ../../$@ mapcache.c grfio.o ../zlib/unz.o -lz
 
 clean:
-	rm -rf ../../tools/adduser ../../tools/convert ../../mapcache
+	rm -rf *.o ../../tools/adduser ../../tools/convert ../../mapcache
diff --git a/src/tool/convert.c b/src/tool/convert.c
index 0072b5b75..5cb096fdb 100644
--- a/src/tool/convert.c
+++ b/src/tool/convert.c
@@ -284,7 +284,8 @@ int mmo_char_convert(char *fname1,char *fname2)
   	  fprintf(ofp,"%s" RETCODE,line);
     }
   }
-  fcloseall();
+  fclose(ifp);
+  fclose(ofp);
   return 0;
 }
 
diff --git a/src/tool/grfio.c b/src/tool/grfio.c
index 7df12696c..3b19ca2f8 100644
--- a/src/tool/grfio.c
+++ b/src/tool/grfio.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <malloc.h>
 #include <sys/stat.h>
 
 #include "grfio.h"
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index 79de65e0b..d088a9d52 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 
 #ifndef _WIN32
 #include <unistd.h>
-- 
cgit v1.2.3-60-g2f50