fix basic types redefinition

This commit is contained in:
Przemyslaw Skibinski 2016-12-21 09:26:00 +01:00
parent 20b089e53d
commit 5736db219e
2 changed files with 8 additions and 2 deletions

View File

@ -46,6 +46,8 @@ MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (size
/*-************************************************************** /*-**************************************************************
* Basic Types * Basic Types
*****************************************************************/ *****************************************************************/
#ifndef BASIC_TYPES_DEFINED
#define BASIC_TYPES_DEFINED
#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) #if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
# include <stdint.h> # include <stdint.h>
typedef uint8_t BYTE; typedef uint8_t BYTE;
@ -66,6 +68,7 @@ MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (size
typedef signed long long S64; typedef signed long long S64;
typedef ptrdiff_t iPtrDiff; typedef ptrdiff_t iPtrDiff;
#endif #endif
#endif
/*-************************************************************** /*-**************************************************************

View File

@ -84,6 +84,8 @@ extern "C" {
/*-************************************************************** /*-**************************************************************
* Basic Types * Basic Types
*****************************************************************/ *****************************************************************/
#ifndef BASIC_TYPES_DEFINED
#define BASIC_TYPES_DEFINED
#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) #if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
# include <stdint.h> # include <stdint.h>
typedef uint8_t BYTE; typedef uint8_t BYTE;
@ -102,6 +104,7 @@ extern "C" {
typedef unsigned long long U64; typedef unsigned long long U64;
typedef signed long long S64; typedef signed long long S64;
#endif #endif
#endif
/*-**************************************** /*-****************************************