diff options
author | 2015-12-09 10:50:20 +0100 | |
---|---|---|
committer | 2015-12-09 10:50:20 +0100 | |
commit | 1d40aecb585e8dd1fedefdd35a833c66fc2a1b96 (patch) | |
tree | 32e8c69d15ff9577e8f7c042b49b3865be8695e3 | |
parent | 700683468a362d039644207620ef8e01b0e78419 (diff) |
Cleanup of osdcomm.h (nw)
-rw-r--r-- | src/lib/util/corealloc.cpp | 5 | ||||
-rw-r--r-- | src/osd/osdcomm.h | 62 |
2 files changed, 17 insertions, 50 deletions
diff --git a/src/lib/util/corealloc.cpp b/src/lib/util/corealloc.cpp index 9ca7af380d3..9e25af63b10 100644 --- a/src/lib/util/corealloc.cpp +++ b/src/lib/util/corealloc.cpp @@ -27,7 +27,10 @@ // define this to zap memory to a fixed non-0 value before freeing //#define OVERWRITE_FREED_MEMORY - +// compatibility with non-clang compilers +#ifndef __has_feature + #define __has_feature(x) 0 +#endif //************************************************************************** // CONSTANTS diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index 9465be7477c..b00c74869f7 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -16,7 +16,7 @@ #include <stdio.h> #include <string.h> - +#include <cstdint> /*************************************************************************** COMPILER-SPECIFIC NASTINESS @@ -29,38 +29,23 @@ /* Some optimizations/warnings cleanups for GCC */ -#if defined(__GNUC__) && (__GNUC__ >= 3) +#if defined(__GNUC__) #define ATTR_UNUSED __attribute__((__unused__)) #define ATTR_NORETURN __attribute__((noreturn)) #define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y))) -#define ATTR_MALLOC __attribute__((malloc)) -#define ATTR_PURE __attribute__((pure)) #define ATTR_CONST __attribute__((const)) #define ATTR_FORCE_INLINE __attribute__((always_inline)) #define ATTR_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) #define ATTR_DEPRECATED __attribute__((deprecated)) -/* not supported in GCC prior to 4.4.x */ -#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4) #define ATTR_HOT __attribute__((hot)) #define ATTR_COLD __attribute__((cold)) -#else -#define ATTR_HOT -#define ATTR_COLD -#endif #define UNEXPECTED(exp) __builtin_expect(!!(exp), 0) #define EXPECTED(exp) __builtin_expect(!!(exp), 1) #define RESTRICT __restrict__ -#define SETJMP_GNUC_PROTECT() (void)__builtin_return_address(1) #else #define ATTR_UNUSED -#if defined(_MSC_VER) && (_MSC_VER >= 1200) #define ATTR_NORETURN __declspec(noreturn) -#else -#define ATTR_NORETURN -#endif #define ATTR_PRINTF(x,y) -#define ATTR_MALLOC -#define ATTR_PURE #define ATTR_CONST #define ATTR_FORCE_INLINE __forceinline #define ATTR_NONNULL(...) @@ -70,7 +55,6 @@ #define UNEXPECTED(exp) (exp) #define EXPECTED(exp) (exp) #define RESTRICT -#define SETJMP_GNUC_PROTECT() do {} while (0) #endif @@ -79,43 +63,28 @@ FUNDAMENTAL TYPES ***************************************************************************/ -/* These types work on most modern compilers; however, OSD code can - define their own by setting OSD_TYPES_DEFINED */ - -#ifndef OSD_TYPES_DEFINED /* 8-bit values */ -typedef unsigned char UINT8; -typedef signed char INT8; +using UINT8 = uint8_t; +using INT8 = int8_t; /* 16-bit values */ -typedef unsigned short UINT16; -typedef signed short INT16; +using UINT16 = uint16_t; +using INT16 = int16_t; /* 32-bit values */ -#ifndef _WINDOWS_H -typedef unsigned int UINT32; -typedef signed int INT32; -#endif +using UINT32 = uint32_t; +using INT32 = int32_t; /* 64-bit values */ -#ifndef _WINDOWS_H -#ifdef _MSC_VER -typedef signed __int64 INT64; -typedef unsigned __int64 UINT64; -#else -__extension__ typedef unsigned long long UINT64; -__extension__ typedef signed long long INT64; -#endif -#endif - -#endif +using UINT64 = uint64_t; +using INT64 = int64_t; /* pointer-sized values */ #ifdef PTR64 -typedef UINT64 FPTR; +using FPTR = uint64_t; #else -typedef UINT32 FPTR; +using FPTR = uint32_t; #endif @@ -165,7 +134,7 @@ typedef UINT32 FPTR; /* MINGW has adopted the MSVC formatting for 64-bit ints as of gcc 4.4 */ -#if (defined(__MINGW32__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))) || defined(_MSC_VER) +#if defined(__MINGW32__) || defined(_MSC_VER) #define I64FMT "I64" #else #define I64FMT "ll" @@ -218,11 +187,6 @@ typedef UINT32 FPTR; #define LITTLE_ENDIANIZE_INT64(x) (FLIPENDIAN_INT64(x)) #endif /* LSB_FIRST */ -// compatibility with non-clang compilers -#ifndef __has_feature - #define __has_feature(x) 0 -#endif - #ifdef _MSC_VER #include <malloc.h> typedef ptrdiff_t ssize_t; |