From 32ebde394d7762fdbb28ba9b5c3ce9a232292bb7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 2 Mar 2006 16:17:47 +0000 Subject: - Applied Snufkin's patch to fix compilation on FreeBSD. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5428 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/cbasetypes.h | 4 ++++ src/common/grfio.c | 4 +++- src/common/mapindex.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index ff9109dd1..505eb6752 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -59,9 +59,13 @@ typedef unsigned char uchar; typedef signed char schar; typedef signed short sshort; +#ifndef __FREEBSD__ typedef unsigned short ushort; +#endif typedef signed int sint; // don't use (only for ie. scanf) +#ifndef __FREEBSD__ typedef unsigned int uint; // don't use +#endif typedef signed long slong; // don't use (only for ie. file-io) typedef unsigned long ulong; // don't use diff --git a/src/common/grfio.c b/src/common/grfio.c index eef4ea654..fcc1ee461 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -40,7 +40,9 @@ #include "../zlib/zlib.h" #include "../zlib/iowin32.h" #else - #include + #ifndef __FREEBSD__ + #include + #endif #endif typedef unsigned char BYTE; diff --git a/src/common/mapindex.c b/src/common/mapindex.c index e600b5ad7..156dc6243 100644 --- a/src/common/mapindex.c +++ b/src/common/mapindex.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include "showmsg.h" #define MAX_MAPINDEX 2000 -- cgit v1.2.3-60-g2f50