From 39bece2eb2c650540bec4c23801338f4fd7c7291 Mon Sep 17 00:00:00 2001 From: flaviojs Date: Wed, 6 Jul 2011 18:39:57 +0000 Subject: * Changed grfio.c include order and moved zlib include from the header to the source. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14887 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/common/grfio.c | 13 ++++++------- src/common/grfio.h | 2 -- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b328b3cdf..03f408b19 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/07/06 + * Changed grfio.c include order and moved zlib include from the header to the source. [FlavioJS] 2011/07/05 * CMake: split txt and sql variants of login-server and map-server. [FlavioJS] 2011/07/04 diff --git a/src/common/grfio.c b/src/common/grfio.c index e7549ecb4..7e8aa38d0 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -1,19 +1,18 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include -#include -#include -#include - -#include "grfio.h" - #include "../common/cbasetypes.h" #include "../common/showmsg.h" #include "../common/malloc.h" #include "../common/strlib.h" #include "../common/utils.h" +#include "grfio.h" +#include +#include +#include +#include +#include //---------------------------- // file entry table struct diff --git a/src/common/grfio.h b/src/common/grfio.h index d5334ccf3..5d46771b9 100644 --- a/src/common/grfio.h +++ b/src/common/grfio.h @@ -4,8 +4,6 @@ #ifndef _GRFIO_H_ #define _GRFIO_H_ -#include - void grfio_init(char*); // GRFIO Initialize void grfio_final(void); // GRFIO Finalize void* grfio_reads(char*,int*); // GRFIO data file read & size get -- cgit v1.2.3-70-g09d2