mirrors/zstd
0
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2024-11-25 20:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix basic types redefinition

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/common/mem.h
View File

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

7
programs/util.h
View File

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