Fixed "warning: redefinition of [ushort/uint/ulong]"

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7938 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 11 insertions, 7 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7f7bcf337..a54b28885 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/07/28

+	* Fixed "warning: redefinition of [ushort/uint/ulong]" [Toms]

 	* Fixed duplicate case value on NJ_SUITON [Toms]

 2006/07/27

 	* Fixed a memory leak when there exists more than one user function with

diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 097b5241c..fe31f4c8d 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -60,15 +60,18 @@
 typedef unsigned char	uchar;

 typedef   signed char	schar;

 typedef   signed short	sshort;

-#ifndef __FREEBSD__

-typedef unsigned short	ushort;

+

+#if !defined(__FREEBSD__) && !defined(_SYS_TYPES_H)

+	typedef unsigned short  ushort;

+#endif

+typedef   signed int    sint;   // don't use (only for ie. scanf)

+#if !defined(__FREEBSD__) && !defined(_SYS_TYPES_H)

+	typedef unsigned int    uint;   // don't use

 #endif

-typedef   signed int	sint;	// don't use (only for ie. scanf)

-#ifndef __FREEBSD__

-typedef unsigned int	uint;	// don't use

+typedef   signed long   slong;  // don't use (only for ie. file-io)

+#ifndef _SYS_TYPES_H

+	typedef unsigned long   ulong;  // don't use

 #endif

-typedef   signed long	slong;	// don't use (only for ie. file-io)

-typedef unsigned long	ulong;	// don't use

 

 #ifndef WIN32

 typedef char*           pchar;