From ae9b7438fabcac5a58314ead1a9e17e2e4aa2a22 Mon Sep 17 00:00:00 2001 From: Hleb Valoshka <375gnu@gmail.com> Date: Tue, 3 Sep 2019 23:18:36 +0300 Subject: [PATCH] Use standard types taken from debian --- src/celutil/basictypes.h | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/celutil/basictypes.h b/src/celutil/basictypes.h index 560b39b8d..d64f523e0 100644 --- a/src/celutil/basictypes.h +++ b/src/celutil/basictypes.h @@ -10,34 +10,26 @@ #ifndef _BASICTYPES_H_ #define _BASICTYPES_H_ +#include + typedef unsigned int uint; // Fixed size types -typedef int int32; -typedef unsigned int uint32; -typedef short int16; -typedef unsigned short uint16; -typedef char int8; -typedef unsigned char uint8; +typedef int32_t int32; +typedef uint32_t uint32; +typedef int16_t int16; +typedef uint16_t uint16; +typedef int8_t int8; +typedef uint8_t uint8; +typedef int64_t int64; +typedef uint64_t uint64; -#ifdef _MSC_VER -// MS Visual C++ does not include stdint.h -typedef __int64 int64; -typedef unsigned __int64 uint64; -#define INT64_MAX LLONG_MAX -#define UINT64_MAX ULLONG_MAX -#else -#include -#include -typedef int64_t int64; -typedef uint64_t uint64; +#ifndef INT64_MAX #define INT64_MAX 9223372036854775807LL +#endif #ifndef UINT64_MAX #define UINT64_MAX 0xffffffffffffffffULL #endif -//#define INT64_MAX std::numeric_limits::max() -//#define UINT64_MAX std::numeric_limits::max() -#endif #endif // _BASICTYPES_H_