diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-27 07:41:05 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-27 07:41:05 +0000 |
| commit | c3fe5f43ebce077d8711fe7ba4a30cb78dea2d38 (patch) | |
| tree | 38e7f5d78975a9777dec8e33a4deeca32db5fe00 /src/tool | |
| parent | 1c82999ec3876f8198b44919fdcdd0a7806613ce (diff) | |
| download | hercules-c3fe5f43ebce077d8711fe7ba4a30cb78dea2d38.tar.gz hercules-c3fe5f43ebce077d8711fe7ba4a30cb78dea2d38.tar.bz2 hercules-c3fe5f43ebce077d8711fe7ba4a30cb78dea2d38.tar.xz hercules-c3fe5f43ebce077d8711fe7ba4a30cb78dea2d38.zip | |
- 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
Diffstat (limited to 'src/tool')
| -rw-r--r-- | src/tool/Makefile | 2 | ||||
| -rw-r--r-- | src/tool/convert.c | 3 | ||||
| -rw-r--r-- | src/tool/grfio.c | 1 | ||||
| -rw-r--r-- | src/tool/mapcache.c | 1 |
4 files changed, 3 insertions, 4 deletions
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> |