From 25673a0c42433c753f5e3f65ec9b4adfc6275530 Mon Sep 17 00:00:00 2001 From: castano Date: Mon, 20 Sep 2010 17:55:36 +0000 Subject: [PATCH] Use posh type definitions. --- src/nvcore/DefsGnucDarwin.h | 5 +++-- src/nvcore/DefsGnucLinux.h | 3 ++- src/nvcore/DefsGnucWin32.h | 3 ++- src/nvcore/DefsVcWin32.h | 4 ++-- src/nvcore/nvcore.h | 17 +++++++++++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/nvcore/DefsGnucDarwin.h b/src/nvcore/DefsGnucDarwin.h index 5442b79..89ad97d 100644 --- a/src/nvcore/DefsGnucDarwin.h +++ b/src/nvcore/DefsGnucDarwin.h @@ -2,7 +2,7 @@ #error "Do not include this file directly." #endif -#include // uint8_t, int8_t, ... +//#include // uint8_t, int8_t, ... // Function linkage #define DLL_IMPORT @@ -48,7 +48,7 @@ #define restrict __restrict__ - +/* // Type definitions typedef uint8_t uint8; typedef int8_t int8; @@ -64,3 +64,4 @@ typedef int64_t int64; // Aliases typedef uint32 uint; +*/ diff --git a/src/nvcore/DefsGnucLinux.h b/src/nvcore/DefsGnucLinux.h index a8e2a29..91f8fbd 100644 --- a/src/nvcore/DefsGnucLinux.h +++ b/src/nvcore/DefsGnucLinux.h @@ -47,7 +47,7 @@ #define restrict __restrict__ - +/* // Type definitions typedef unsigned char uint8; typedef signed char int8; @@ -63,3 +63,4 @@ typedef signed long long int64; // Aliases typedef uint32 uint; +*/ diff --git a/src/nvcore/DefsGnucWin32.h b/src/nvcore/DefsGnucWin32.h index 2f8e3cc..466886e 100644 --- a/src/nvcore/DefsGnucWin32.h +++ b/src/nvcore/DefsGnucWin32.h @@ -41,7 +41,7 @@ #define restrict __restrict__ - +/* // Type definitions typedef unsigned char uint8; typedef signed char int8; @@ -57,3 +57,4 @@ typedef signed long long int64; // Aliases typedef uint32 uint; +*/ diff --git a/src/nvcore/DefsVcWin32.h b/src/nvcore/DefsVcWin32.h index c1b6d36..796a7e2 100644 --- a/src/nvcore/DefsVcWin32.h +++ b/src/nvcore/DefsVcWin32.h @@ -39,7 +39,7 @@ #define __FUNC__ __FUNCTION__ #endif - +/* // Type definitions typedef unsigned char uint8; typedef signed char int8; @@ -55,7 +55,7 @@ typedef signed __int64 int64; // Aliases typedef uint32 uint; - +*/ // Unwanted VC++ warnings to disable. /* diff --git a/src/nvcore/nvcore.h b/src/nvcore/nvcore.h index 469f6ad..274bd86 100644 --- a/src/nvcore/nvcore.h +++ b/src/nvcore/nvcore.h @@ -99,6 +99,23 @@ #define NV_ENDIAN_STRING POSH_ENDIAN_STRING +// Type definitions: +typedef posh_u8_t uint8; +typedef posh_i8_t int8; + +typedef posh_u16_t uint16; +typedef posh_i16_t int16; + +typedef posh_u32_t uint32; +typedef posh_i32_t int32; + +typedef posh_u64_t uint64; +typedef posh_i64_t int64; + +// Aliases +typedef uint32 uint; + + // Version string: #define NV_VERSION_STRING \ NV_OS_STRING "/" NV_CC_STRING "/" NV_CPU_STRING"/" \