Mass update refactoring base types to stdint types.

Author: d3x0r

config/deadmain.c

@@ -21,7 +21,7 @@ int main( void )
 	printf( "rt_init size=%ld\n", sizeof( struct rt_init ) );
 	printf( "begin=%p\n", begin );
 	printf( "end=%p\n", end );
-	printf( "extra=%ld\n", ((PTRSZVAL)end - (PTRSZVAL)begin)%sizeof( struct rt_init ) );
+	printf( "extra=%ld\n", ((uintptr_t)end - (uintptr_t)begin)%sizeof( struct rt_init ) );
 	for( current = begin; current < end; current++ )
 	{
 		printf( "Entry %p(%d) = %s %s(%d)\n"

include/colordef.h

@@ -51,8 +51,8 @@ SACK_NAMESPACE
 
 #else
 #if defined( _OPENGL_DRIVER ) || defined( USE_OPENGL_COMPAT_COLORS )
-#  define Color( r,g,b ) (((_32)( ((_8)(r))|((_16)((_8)(g))<<8))|(((_32)((_8)(b))<<16)))|0xFF000000)
-#  define AColor( r,g,b,a ) (((_32)( ((_8)(r))|((_16)((_8)(g))<<8))|(((_32)((_8)(b))<<16)))|((a)<<24))
+#  define Color( r,g,b ) (((uint32_t)( ((uint8_t)(r))|((uint16_t)((uint8_t)(g))<<8))|(((uint32_t)((uint8_t)(b))<<16)))|0xFF000000)
+#  define AColor( r,g,b,a ) (((uint32_t)( ((uint8_t)(r))|((uint16_t)((uint8_t)(g))<<8))|(((uint32_t)((uint8_t)(b))<<16)))|((a)<<24))
 #  define SetAlpha( rgb, a ) ( ((rgb)&0x00FFFFFF) | ( (a)<<24 ) )
 #  define SetGreen( rgb, g ) ( ((rgb)&0xFFFF00FF) | ( ((g)&0xFF)<<8 ) )
 #  define SetBlue( rgb, b )  ( ((rgb)&0xFF00FFFF) | ( ((b)&0xFF)<<16 ) )
@@ -77,9 +77,9 @@ SACK_NAMESPACE
    CDATA color3 = Color( 0,0,255); // blue only, this is birght blue
    CDATA color4 = Color(93,93,32); // this is probably a goldish grey
    </code>                                                             */
-#define Color( r,g,b ) (((_32)( ((_8)((b)AND_FF))|((_16)((_8)((g))AND_FF)<<8))|(((_32)((_8)((r))AND_FF)<<16)))|0xFF000000)
+#define Color( r,g,b ) (((uint32_t)( ((uint8_t)((b)AND_FF))|((uint16_t)((uint8_t)((g))AND_FF)<<8))|(((uint32_t)((uint8_t)((r))AND_FF)<<16)))|0xFF000000)
 /* Build a color with alpha specified. */
-#define AColor( r,g,b,a ) (((_32)( ((_8)((b)AND_FF))|((_16)((_8)((g))AND_FF)<<8))|(((_32)((_8)((r))AND_FF)<<16)))|(((a)AND_FF)<<24))
+#define AColor( r,g,b,a ) (((uint32_t)( ((uint8_t)((b)AND_FF))|((uint16_t)((uint8_t)((g))AND_FF)<<8))|(((uint32_t)((uint8_t)((r))AND_FF)<<16)))|(((a)AND_FF)<<24))
 /* Sets the alpha part of a color. (0-255 value, 0 being
    transparent, and 255 solid(opaque))
    Example
@@ -116,9 +116,9 @@ SACK_NAMESPACE
         /* a 4 byte array of color (not really used, we mostly went with CDATA and PCDATA instead of COLOR and PCOLOR */
 		typedef COLOR_CHANNEL COLOR[4];
 		// color data raw...
-		typedef _32 CDATA;
+		typedef uint32_t CDATA;
 		/* pointer to an array of 32 bit colors */
-		typedef _32 *PCDATA;
+		typedef uint32_t *PCDATA;
 		/* A Pointer to <link COLOR>. Probably an array of color (a
 		 block of pixels for instance)                            */
 		typedef COLOR *PCOLOR;

include/configscript.h

@@ -98,7 +98,7 @@ CONFIGSCR_PROC( LOGICAL, BeginNamedConfiguration )( PCONFIG_HANDLER pch, CTEXTST
 // use this to restore the prior configuration state.
 CONFIGSCR_PROC( void, EndConfiguration )( PCONFIG_HANDLER pch );
 
-typedef PTRSZVAL (CPROC*USER_CONFIG_HANDLER)( PTRSZVAL, arg_list args );
+typedef uintptr_t (CPROC*USER_CONFIG_HANDLER)( uintptr_t, arg_list args );
 CONFIGSCR_PROC( void, AddConfigurationEx )( PCONFIG_HANDLER pch
 														, CTEXTSTR format
 														, USER_CONFIG_HANDLER Process DBG_PASS );
@@ -110,7 +110,7 @@ CONFIGSCR_PROC( void, AddConfigurationEx )( PCONFIG_HANDLER pch
 #define AddConfiguration(pch,f,pr) AddConfigurationEx(pch,f,pr DBG_SRC )
 #define AddConfigurationMethod AddConfiguration
 
-// FILTER receives a ptrszval that was given at configuration (addition to handler)
+// FILTER receives a uintptr_t that was given at configuration (addition to handler)
 // it receives a PTEXT block of (binary) data... and must result with
 // PTEXT segments which are lines which may or may not have \r\n\\ all
 // of which are removed before being resulted to the application.
@@ -120,15 +120,15 @@ CONFIGSCR_PROC( void, AddConfigurationEx )( PCONFIG_HANDLER pch
 typedef PTEXT (CPROC*USER_FILTER)( POINTER *, PTEXT );
 CONFIGSCR_PROC( void, AddConfigurationFilter )( PCONFIG_HANDLER pch, USER_FILTER filter );
 CONFIGSCR_PROC( void, ClearDefaultFilters )( PCONFIG_HANDLER pch );
-CONFIGSCR_PROC( void, SetConfigurationEndProc )( PCONFIG_HANDLER pch, PTRSZVAL (CPROC *Process)( PTRSZVAL ) );
+CONFIGSCR_PROC( void, SetConfigurationEndProc )( PCONFIG_HANDLER pch, uintptr_t (CPROC *Process)( uintptr_t ) );
 CONFIGSCR_PROC( void, SetConfigurationUnhandled )( PCONFIG_HANDLER pch
-																, PTRSZVAL (CPROC *Process)( PTRSZVAL, CTEXTSTR ) );
+																, uintptr_t (CPROC *Process)( uintptr_t, CTEXTSTR ) );
 
 CONFIGSCR_PROC( int, ProcessConfigurationFile )( PCONFIG_HANDLER pch
 															  , CTEXTSTR name
-															  , PTRSZVAL psv
+															  , uintptr_t psv
 															  );
-CONFIGSCR_PROC( PTRSZVAL, ProcessConfigurationInput )( PCONFIG_HANDLER pch, CTEXTSTR block, int size, PTRSZVAL psv );
+CONFIGSCR_PROC( uintptr_t, ProcessConfigurationInput )( PCONFIG_HANDLER pch, CTEXTSTR block, int size, uintptr_t psv );
 
 /*
  * TO BE IMPLEMENTED
@@ -153,7 +153,7 @@ CONFIGSCR_PROC( void, ExpandConfigString )( TEXTSTR out, CTEXTSTR in );
 
 #ifdef __cplusplus
 
-//typedef PTRSZVAL CPROC ::(*USER_CONFIG_METHOD)( ... );
+//typedef uintptr_t CPROC ::(*USER_CONFIG_METHOD)( ... );
 
 typedef class config_reader {
    PCONFIG_HANDLER pch;
@@ -174,7 +174,7 @@ typedef class config_reader {
 	{
 		union {
 			struct {
-				_32 junk;
+				uint32_t junk;
             USER_CONFIG_HANDLER Process
 			} c;
          USER_CONFIG_METHOD Process;
@@ -185,7 +185,7 @@ typedef class config_reader {
       */
 	inline int go( CTEXTSTR file, POINTER p )
 	{
-		return ProcessConfigurationFile( pch, file, (PTRSZVAL)p );
+		return ProcessConfigurationFile( pch, file, (uintptr_t)p );
 	}
 } CONFIG_READER;