summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-02 16:17:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-02 16:17:47 +0000
commit32ebde394d7762fdbb28ba9b5c3ce9a232292bb7 (patch)
tree11237588739e7c473336fa9214a859b543db1e9b /src/common
parentc120372c4266e3705b3bed3966d06169d3f0a4b9 (diff)
downloadhercules-32ebde394d7762fdbb28ba9b5c3ce9a232292bb7.tar.gz
hercules-32ebde394d7762fdbb28ba9b5c3ce9a232292bb7.tar.bz2
hercules-32ebde394d7762fdbb28ba9b5c3ce9a232292bb7.tar.xz
hercules-32ebde394d7762fdbb28ba9b5c3ce9a232292bb7.zip
- 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
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cbasetypes.h4
-rw-r--r--src/common/grfio.c4
-rw-r--r--src/common/mapindex.c2
3 files changed, 8 insertions, 2 deletions
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 <zlib.h>
+ #ifndef __FREEBSD__
+ #include <zlib.h>
+ #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 <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <showmsg.h>
+#include "showmsg.h"
#define MAX_MAPINDEX 2000