From c42726e011ada594defa5cee38e5e2b28e8721e5 Mon Sep 17 00:00:00 2001 From: toms Date: Fri, 28 Jul 2006 09:36:47 +0000 Subject: Fixed "warning: redefinition of [ushort/uint/ulong]" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7938 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/cbasetypes.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/common') 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; -- cgit v1.2.3-70-g09d2