* Minor cleaning in cbasetypes.

git-svn-id: https://svn.paradoxsystems.net/trunk@15242 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/common/cbasetypes.h

@@ -41,7 +41,7 @@
 #define CYGWIN
 #endif
 
-// __APPLE__ is the only predefined macro on MacOS X
+// __APPLE__ is the only predefined macro on MacOS
 #if defined(__APPLE__)
 #define __DARWIN__
 #endif
@@ -96,9 +96,9 @@
 // (-20 >= USHRT_MAX) returns true
 #if defined(__FreeBSD__) && defined(__x86_64)
 #undef UCHAR_MAX
-#define UCHAR_MAX (unsigned char)0xff
+#define UCHAR_MAX ((unsigned char)0xff)
 #undef USHRT_MAX
-#define USHRT_MAX (unsigned short)0xffff
+#define USHRT_MAX ((unsigned short)0xffff)
 #endif
 
 // ILP64 isn't supported, so always 32 bits?
@@ -184,7 +184,7 @@ typedef unsigned long int   ppuint32;
 
 #if defined(WIN32) && !defined(MINGW) // does not have a signed size_t
 //////////////////////////////
-#if defined(_WIN64)	// naive 64bit windows platform
+#if defined(_WIN64)	// native 64bit windows platform
 typedef __int64			ssize_t;
 #else
 typedef int				ssize_t;
@@ -234,8 +234,8 @@ typedef uintptr_t uintptr;
 
 // boolean types for C
 typedef char bool;
-#define false	(1==0)
-#define true	(1==1)
+#define false	((bool)(1==0))
+#define true	((bool)(1==1))
 
 //////////////////////////////
 #endif // not __cplusplus
@@ -265,7 +265,7 @@ typedef char bool;
 //////////////////////////////////////////////////////////////////////////
 // should not happen
 #ifndef NULL
-#define NULL (void *)0
+#define NULL ((void *)0)
 #endif
 
 //////////////////////////////////////////////////////////////////////////
@@ -280,8 +280,8 @@ typedef char bool;
 #if defined(WIN32)
 #define PATHSEP '\\'
 #define PATHSEP_STR "\\"
-#elif defined(__APPLE__)
-// FIXME Mac OS X is unix based, is this still correct?
+#elif defined(__APPLE__) && !defined(__MACH__)
+// __MACH__ indicates OS X ( http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
 #define PATHSEP ':'
 #define PATHSEP_STR ":"
 #else
@@ -292,7 +292,7 @@ typedef char bool;
 //////////////////////////////////////////////////////////////////////////
 // Assert
 
-#if ! defined(Assert)
+#if !defined(Assert)
 #if defined(RELEASE)
 #define Assert(EX)
 #else