Fixed internal additional typedefs

This commit is contained in:
Ianos Gnatiuc 2005-10-18 03:49:35 +00:00
parent 732be01903
commit 0e5a6c06b7
3 changed files with 68 additions and 57 deletions

View File

@ -106,31 +106,36 @@
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Supplements for the built-in types // Supplements for the built-in types
typedef signed char schar;
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef unsigned int uint;
typedef unsigned long ulong;
typedef unsigned char bit;
#ifdef _MSC_VER #ifdef _MSC_VER
typedef uchar uint8_t; typedef signed char int8_t;
typedef schar int8_t; typedef unsigned char uint8_t;
typedef ushort uint16_t; typedef signed short int16_t;
typedef short int16_t; typedef unsigned short uint16_t;
typedef INT int32_t; typedef signed long int32_t;
typedef UINT uint32_t; typedef unsigned long uint32_t;
#endif #endif
typedef uint8_t byte; typedef signed int sint;
typedef int8_t sbyte; typedef unsigned int uint;
typedef uint16_t word;
typedef int16_t sword;
typedef uint32_t dword;
typedef int32_t sdword;
typedef uint32_t time32_t; /* 32-bit time_t type */ typedef uint8_t bit;
typedef int8_t sbyte;
typedef uint8_t byte;
typedef int8_t schar;
typedef uint8_t uchar;
typedef int16_t sword;
typedef uint16_t word;
typedef int16_t sshort;
typedef uint16_t ushort;
typedef int32_t sdword;
typedef uint32_t dword;
typedef int32_t slong;
typedef uint32_t ulong;
typedef uint32_t time32_t; /* 32-bit time_t type */
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Common function-pointer types // Common function-pointer types

View File

@ -3,33 +3,34 @@
#ifndef __TYPEDEFS_H__ #ifndef __TYPEDEFS_H__
#define __TYPEDEFS_H__ #define __TYPEDEFS_H__
#ifndef __goldall_h
#ifdef _MSC_VER #ifdef _MSC_VER
#include <windows.h> #include <windows.h>
typedef UCHAR uint8_t; typedef signed char int8_t;
typedef signed char int8_t; typedef unsigned char uint8_t;
typedef WORD uint16_t; typedef signed short int16_t;
typedef short int16_t; typedef unsigned short uint16_t;
typedef INT int32_t; typedef signed long int32_t;
typedef UINT uint32_t; typedef unsigned long uint32_t;
#else #else
#include <stdint.h> #include <stdint.h>
#endif #endif //#ifdef _MSC_VER
typedef unsigned char bit; typedef uint8_t bit;
typedef uint8_t byte; typedef int8_t sbyte;
typedef uint8_t byte;
typedef int8_t sbyte; typedef int16_t sword;
typedef uint16_t word;
typedef int16_t sshort;
typedef uint16_t ushort;
typedef uint16_t word; typedef int32_t sdword;
typedef int16_t sword; typedef uint32_t dword;
typedef uint32_t dword; #endif //#ifndef __goldall_h
typedef int32_t sdword;
typedef uint16_t ushort; #endif //#ifndef __TYPEDEFS_H__
typedef int16_t sshort;
#endif

View File

@ -44,29 +44,34 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <windows.h> #include <windows.h>
typedef UCHAR uint8_t; typedef signed char int8_t;
typedef signed char int8_t; typedef unsigned char uint8_t;
typedef WORD uint16_t; typedef signed short int16_t;
typedef short int16_t; typedef unsigned short uint16_t;
typedef INT int32_t; typedef signed long int32_t;
typedef UINT uint32_t; typedef unsigned long uint32_t;
#else #else
#include <stdint.h> #include <stdint.h>
#endif #endif //#ifdef _MSC_VER
typedef signed int sint;
typedef unsigned int uint; typedef unsigned int uint;
typedef signed int sint;
typedef unsigned char bit; typedef uint8_t bit;
typedef uint8_t byte;
typedef int8_t sbyte; typedef int8_t sbyte;
typedef uint16_t word; typedef uint8_t byte;
typedef int16_t sword;
typedef uint32_t dword; typedef int16_t sword;
typedef int32_t sdword; typedef uint16_t word;
typedef uint16_t ushort; typedef int16_t sshort;
typedef int16_t sshort; typedef uint16_t ushort;
#endif
typedef int32_t sdword;
typedef uint32_t dword;
#endif //#ifndef __goldall_h
/**********/ /**********/
/* Macros */ /* Macros */