Mercurial > libavutil.hg

changeset 838:5e375940e195 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use alias-safe types in AV_[RW] macros
author mru
date Thu, 18 Feb 2010 13:40:21 +0000
parents fb1a89b9ae54
children 8af0a7ac8482
files intreadwrite.h
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/intreadwrite.h	Thu Feb 18 13:40:19 2010 +0000
+++ b/intreadwrite.h	Thu Feb 18 13:40:21 2010 +0000
@@ -177,12 +177,12 @@
 
 #if   HAVE_ATTRIBUTE_PACKED
 
-struct unaligned_64 { uint64_t l; } __attribute__((packed));
-struct unaligned_32 { uint32_t l; } __attribute__((packed));
-struct unaligned_16 { uint16_t l; } __attribute__((packed));
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
 
-#   define AV_RN(s, p) (((const struct unaligned_##s *) (p))->l)
-#   define AV_WN(s, p, v) ((((struct unaligned_##s *) (p))->l) = (v))
+#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
 
 #elif defined(__DECC)
 
@@ -191,8 +191,8 @@
 
 #elif HAVE_FAST_UNALIGNED
 
-#   define AV_RN(s, p) (*((const uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((uint##s##_t*)(p)) = (v))
+#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+#   define AV_WN(s, p, v) (((uint##s##_t*)(p))->u##s = (v))
 
 #else