Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7938 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2006-07-28 09:36:47 +00:00
parent c7d47f2325
commit f15fedf466
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/28 2006/07/28
* Fixed "warning: redefinition of [ushort/uint/ulong]" [Toms]
* Fixed duplicate case value on NJ_SUITON [Toms] * Fixed duplicate case value on NJ_SUITON [Toms]
2006/07/27 2006/07/27
* Fixed a memory leak when there exists more than one user function with * Fixed a memory leak when there exists more than one user function with

17
src/common/cbasetypes.h
View File

@ -60,15 +60,18 @@
typedef unsigned char uchar; typedef unsigned char uchar;
typedef signed char schar; typedef signed char schar;
typedef signed short sshort; typedef signed short sshort;
#ifndef __FREEBSD__
typedef unsigned short ushort; #if !defined(__FREEBSD__) && !defined(_SYS_TYPES_H)
typedef unsigned short ushort;
#endif #endif
typedef signed int sint; // don't use (only for ie. scanf) typedef signed int sint; // don't use (only for ie. scanf)
#ifndef __FREEBSD__ #if !defined(__FREEBSD__) && !defined(_SYS_TYPES_H)
typedef unsigned int uint; // don't use typedef unsigned int uint; // don't use
#endif
typedef signed long slong; // don't use (only for ie. file-io)
#ifndef _SYS_TYPES_H
typedef unsigned long ulong; // don't use
#endif #endif
typedef signed long slong; // don't use (only for ie. file-io)
typedef unsigned long ulong; // don't use
#ifndef WIN32 #ifndef WIN32
typedef char* pchar; typedef char* pchar;