summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-20 01:28:50 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-20 01:28:50 +0000
commit32537c59ad47e9261938aa723d4e87c86b061089 (patch)
tree0ebea94b18b1c547bb1ff1855b37d4a77360d227
parent558c681aac46514ef406668f9d28dae34e778ec4 (diff)
downloadhercules-32537c59ad47e9261938aa723d4e87c86b061089.tar.gz
hercules-32537c59ad47e9261938aa723d4e87c86b061089.tar.bz2
hercules-32537c59ad47e9261938aa723d4e87c86b061089.tar.xz
hercules-32537c59ad47e9261938aa723d4e87c86b061089.zip
* Removed ; from INTPTR_* defines (since r13449).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14472 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/common/cbasetypes.h10
2 files changed, 6 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1fdf5768e..a400034cd 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -11,6 +11,7 @@ Date Added
* Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei]
* Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei]
* Fixed pc_marriage not checking spouse character job for baby class. [Ai4rei]
+ * Removed ; from INTPTR_* defines (since r13449). [Ai4rei]
2010/11/16
* Added a missing argument to a warning containing a format specifier. [Paradox924X]
2010/11/15
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index b377d6ef0..488e4db49 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -205,15 +205,15 @@ typedef uint64 uintptr;
typedef int64 intptr;
#define UINTPTR_MIN UINT64_MIN
#define UINTPTR_MAX UINT64_MAX
-#define INTPTR_MIN INT64_MIN;
-#define INTPTR_MAX INT64_MAX;
+#define INTPTR_MIN INT64_MIN
+#define INTPTR_MAX INT64_MAX
#else
typedef uint32 uintptr;
typedef int32 intptr;
#define UINTPTR_MIN UINT32_MIN
#define UINTPTR_MAX UINT32_MAX
-#define INTPTR_MIN INT32_MIN;
-#define INTPTR_MAX INT32_MAX;
+#define INTPTR_MIN INT32_MIN
+#define INTPTR_MAX INT32_MAX
#endif
@@ -254,7 +254,7 @@ typedef char bool;
#define true (1==1)
//////////////////////////////
-#endif // not cplusplus
+#endif // not __cplusplus
//////////////////////////////
//////////////////////////////////////////////////////////////////////////