diff options
| author | Dongkyun, Son <dongkyun.s@samsung.com> | 2016-11-02 13:32:48 +0900 |
|---|---|---|
| committer | Dongkyun, Son <dongkyun.s@samsung.com> | 2016-11-02 13:32:48 +0900 |
| commit | d6ebd994ecf4a6cd3d84d07bbd6076b1c9fd06aa (patch) | |
| tree | caa9649ea8dd83c6d433007c0489d2e5205c26cf | |
| parent | 159b8ff603b57bbf07ead683c66c43247f271c1a (diff) | |
| download | libvpx-sandbox/dkson95/gcc6.tar.gz libvpx-sandbox/dkson95/gcc6.tar.bz2 libvpx-sandbox/dkson95/gcc6.zip | |
Don't redefine max_align_t if defined by GCC or Clangsandbox/dkson95/gcc6
Signed-off-by: Matt Brubeck <mbrubeck@limpet.net>
Signed-off-by: Dongkyun, Son <dongkyun.s@samsung.com>
| -rw-r--r-- | nestegg/halloc/src/align.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nestegg/halloc/src/align.h b/nestegg/halloc/src/align.h index 4c6e1831f..0e57d6ac2 100644 --- a/nestegg/halloc/src/align.h +++ b/nestegg/halloc/src/align.h @@ -15,6 +15,15 @@ #ifndef _LIBP_ALIGN_H_ #define _LIBP_ALIGN_H_ +#ifdef _MSC_VER + +/* + * MSVC defines max_align_t as a double. + */ +typedef double max_align_t; + +#elif !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) + /* * a type with the most strict alignment requirements */ @@ -34,3 +43,5 @@ typedef union max_align max_align_t; #endif +#endif + |