dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-11' into save_ext

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-06-06 01:55:09 +01:00
parent decd749d30 183a5cb114
commit f05ca1ba91
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/bitmath_func.hpp
View File

@@ -365,7 +365,7 @@ static inline T ROR(const T x, const uint8 n)
* (since it will use hardware swapping if available).
* Even though they should return uint16 and uint32, we get
* warnings if we don't cast those (why?) */
#define BSWAP64(x) ((uint32)CFSwapInt64(x))
#define BSWAP64(x) ((uint64)CFSwapInt64(x))
#define BSWAP32(x) ((uint32)CFSwapInt32(x))
#define BSWAP16(x) ((uint16)CFSwapInt16(x))
#elif defined(_MSC_VER)

10
src/stdafx.h
View File

@@ -419,6 +419,16 @@ assert_compile(SIZE_MAX >= UINT32_MAX);
#define unlikely(x) (x)
#endif /* __GNUC__ || __clang__ */
#if defined(__GNUC__) || defined(__clang__)
__attribute__((aligned(1))) typedef uint16 unaligned_uint16;
__attribute__((aligned(1))) typedef uint32 unaligned_uint32;
__attribute__((aligned(1))) typedef uint64 unaligned_uint64;
#else
typedef uint16 unaligned_uint16;
typedef uint32 unaligned_uint32;
typedef uint64 unaligned_uint64;
#endif /* __GNUC__ || __clang__ */
void NORETURN CDECL usererror(const char *str, ...) WARN_FORMAT(1, 2);
void NORETURN CDECL error(const char *str, ...) WARN_FORMAT(1, 2);
void NORETURN CDECL assert_msg_error(int line, const char *file, const char *expr, const char *str, ...) WARN_FORMAT(4, 5);