diff options
| author | Chris Robinson <[email protected]> | 2013-10-06 04:21:03 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2013-10-06 04:21:03 -0700 |
| commit | 9ee3d01f6ed5748ef88a4b5992cd6be48afaf3b8 (patch) | |
| tree | 636e44799fb0e8db0403397d2d872b8d0b09bfd8 /OpenAL32/Include | |
| parent | 69e64e1ed2afad1743fd438bf386e4e98631ce9d (diff) | |
Use a simpler U64 macro to make 64-bit constants
Diffstat (limited to 'OpenAL32/Include')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 94d69bf3..004c4016 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -46,7 +46,17 @@ typedef unsigned long long ALuint64; typedef ptrdiff_t ALintptrEXT; typedef ptrdiff_t ALsizeiptrEXT; -#define MAKEU64(x,y) (((ALuint64)(x)<<32)|(ALuint64)(y)) +#ifndef U64 +#if !defined(_MSC_VER) +#if SIZEOF_LONG_LONG == 8 +#define U64(x) ((ALuint64)(x##ull)) +#elif SIZEOF_LONG == 8 +#define U64(x) ((ALuint64)(x##ul)) +#endif +#else +#define U64(x) ((ALuint64)(x##ui64)) +#endif +#endif #ifdef HAVE_GCC_FORMAT #define PRINTF_STYLE(x, y) __attribute__((format(printf, (x), (y)))) |