diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-02-13 08:08:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-02-13 08:08:03 +0000 |
| commit | 7433ca29825c88a0c30a0e8e00ecb32fa3f04fa1 (patch) | |
| tree | 6b5a3fa71be2acb77b73a89b7e082be46eddf652 /libavutil | |
| parent | 356306aca24e8d86d4c3caaeace49622d6798482 (diff) | |
| download | ffmpeg-7433ca29825c88a0c30a0e8e00ecb32fa3f04fa1.tar.gz | |
Disentangle nested preprocessor directives.
Originally committed as revision 11917 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/mem.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h index 3c7284dd00..84b7728b4a 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -26,13 +26,12 @@ #ifndef FFMPEG_MEM_H #define FFMPEG_MEM_H -#ifdef __GNUC__ - #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #ifdef __ICC + #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v -#else +#elif __GNUC__ + #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used __attribute__ ((aligned (n))) -#endif #else #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v |