summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 21:32:26 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 21:32:26 +0000
commitb21c980c03ea476e324c714a9ad2d5eff5cb981d (patch)
treeb2cec475af42ef301700b9154289e944c8181dc0
parent5fc47d9a1162c5ca8a246ad5ab21aad3dee94975 (diff)
downloadhercules-b21c980c03ea476e324c714a9ad2d5eff5cb981d.tar.gz
hercules-b21c980c03ea476e324c714a9ad2d5eff5cb981d.tar.bz2
hercules-b21c980c03ea476e324c714a9ad2d5eff5cb981d.tar.xz
hercules-b21c980c03ea476e324c714a9ad2d5eff5cb981d.zip
* Added intptr/uintptr to cbasetypes.h (integers with the same size as a pointer).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12632 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/common/cbasetypes.h12
2 files changed, 13 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index bf796d77f..6b3b3deb6 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.
2008/04/21
+ * Added intptr/uintptr to cbasetypes.h (integers with the same size as a pointer). [FlavioJS]
* Rev. 12631 Changed Sacrifice status to end on caster's death, not at 25% HP. [L0ne_W0lf]
- Should also fix over-flow damage returning to sacrificed targets. Partially fixes bugreport:1332
* Updated sql files to latest [Toms]
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 557e263fb..ae0bb8c78 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -190,6 +190,18 @@ typedef unsigned long long uint64;
//////////////////////////////////////////////////////////////////////////
+// pointer sized integers
+//////////////////////////////////////////////////////////////////////////
+#ifdef __64BIT__
+typedef uint64 uintptr;
+typedef int64 intptr;
+#else
+typedef uint32 uintptr;
+typedef int32 intptr;
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////
// some redefine of function redefines for some Compilers
//////////////////////////////////////////////////////////////////////////
#if defined(_MSC_VER) || defined(__BORLANDC__)