Просмотр исходного кода

- 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.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5279 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 лет назад
Родитель
Сommit
af144b690d
2 измененных файлов с 7 добавлено и 2 удалено
  1. 3 0
      Changelog-Trunk.txt
  2. 4 2
      src/mysql/my_global.h

+ 3 - 0
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]

+ 4 - 2
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 */