diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-06 18:39:57 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-06 18:39:57 +0000 |
| commit | 39bece2eb2c650540bec4c23801338f4fd7c7291 (patch) | |
| tree | 3f952c6a60b01e7ec9486accaf2f64a980a7f5c0 | |
| parent | 926c49812706623bfa352a38b171b64c62c51932 (diff) | |
| download | hercules-39bece2eb2c650540bec4c23801338f4fd7c7291.tar.gz hercules-39bece2eb2c650540bec4c23801338f4fd7c7291.tar.bz2 hercules-39bece2eb2c650540bec4c23801338f4fd7c7291.tar.xz hercules-39bece2eb2c650540bec4c23801338f4fd7c7291.zip | |
* 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
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/common/grfio.c | 13 | ||||
| -rw-r--r-- | 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 <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - -#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 <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <zlib.h> //---------------------------- // 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 <zlib.h> - void grfio_init(char*); // GRFIO Initialize void grfio_final(void); // GRFIO Finalize void* grfio_reads(char*,int*); // GRFIO data file read & size get |