diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/mysql/my_global.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c340a3a2e..ca661d2ea 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ 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. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/14
+ * Removed the declaration of puchar and pchar from my_global.h which was
+ preventing compiles on native win NT systems. Drawback is now Win9X systems
+ will fail to compile instead... [Skotlex]
* Hiding cancels Close Confine now. [Skotlex]
* ST_MOVE_ENABLE now also checks for pc_can_move(), and only perform a walk
check if the skill is ground targetted. [Skotlex]
diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h index 65e251ab3..1e2191b51 100644 --- a/src/mysql/my_global.h +++ b/src/mysql/my_global.h @@ -497,8 +497,10 @@ typedef char pbool; /* Mixed prototypes can take char */ typedef short pshort; /* Mixed prototypes can take short int */
typedef float pfloat; /* Mixed prototypes can take float */
#else
-typedef int pchar; /* Mixed prototypes can't take char */
-typedef uint puchar; /* Mixed prototypes can't take char */
+//These types already exist in WinNT systems...
+//...but what do we do about Win9X ones? [Skotlex]
+//typedef int pchar; /* Mixed prototypes can't take char */
+//typedef uint puchar; /* Mixed prototypes can't take char */
typedef int pbool; /* Mixed prototypes can't take char */
typedef int pshort; /* Mixed prototypes can't take short int */
typedef double pfloat; /* Mixed prototypes can't take float */
|