diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 09:36:47 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 09:36:47 +0000 |
| commit | c42726e011ada594defa5cee38e5e2b28e8721e5 (patch) | |
| tree | 133bb469a8e3edef698cb06443576f7d72f2be25 /src/common/cbasetypes.h | |
| parent | 966c0d764245b0a94fad78a216b6958b713c0414 (diff) | |
| download | hercules-c42726e011ada594defa5cee38e5e2b28e8721e5.tar.gz hercules-c42726e011ada594defa5cee38e5e2b28e8721e5.tar.bz2 hercules-c42726e011ada594defa5cee38e5e2b28e8721e5.tar.xz hercules-c42726e011ada594defa5cee38e5e2b28e8721e5.zip | |
Fixed "warning: redefinition of [ushort/uint/ulong]"
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7938 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/cbasetypes.h')
| -rw-r--r-- | src/common/cbasetypes.h | 17 |
1 files changed, 10 insertions, 7 deletions
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;
|