diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-02-09 14:02:13 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-02-09 16:26:30 +0000 |
| commit | faac85005cadb5065d218b0563eeb3272a498073 (patch) | |
| tree | 0b2db404e6dfed246c29fe4c39535a6c2443cdd7 /libavutil/internal.h | |
| parent | 4fa9defc7fdec348d84be912745a166fa6635b8b (diff) | |
lavu/internal: rename macro E(x) to EXPAND(x)
Fixes bunch of warnings of E redefinition under clang.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavutil/internal.h')
| -rw-r--r-- | libavutil/internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 6186d8ec85..462f08c44c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -60,7 +60,7 @@ // Some broken preprocessors need a second expansion // to be forced to tokenize __VA_ARGS__ -#define E(x) x +#define EXPAND(x) x #define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ uint8_t la_##v[sizeof(t s o) + (a)]; \ @@ -70,16 +70,16 @@ DECLARE_ALIGNED(a, t, la_##v) s o; \ t (*v) o = la_##v -#define LOCAL_ALIGNED(a, t, v, ...) E(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) +#define LOCAL_ALIGNED(a, t, v, ...) EXPAND(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) #if HAVE_LOCAL_ALIGNED_8 -# define LOCAL_ALIGNED_8(t, v, ...) E(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) +# define LOCAL_ALIGNED_8(t, v, ...) EXPAND(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) #else # define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__) #endif #if HAVE_LOCAL_ALIGNED_16 -# define LOCAL_ALIGNED_16(t, v, ...) E(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) +# define LOCAL_ALIGNED_16(t, v, ...) EXPAND(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) #else # define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__) #endif |