[Spice-commits] spice/macros.h

[Frediano Ziglio]

 spice/macros.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39be7a8fce1c062a59590517bdab5e75a2d6028f
Author: Victor Toso <victortoso at redhat.com>
Date:   Fri Aug 14 18:24:23 2015 +0200

    macros: fix alignment issue reported by clang
    
    char_device.c:131:52: warning: cast from 'uint8_t *'
    (aka 'unsigned char *') to 'SpiceCharDeviceMsgToClientItem *'
    (aka 'struct SpiceCharDeviceMsgToClientItem *')
    increases required alignment from 1 to 8 [-Wcast-align]
    
     SpiceCharDeviceMsgToClientItem *msg_item = SPICE_CONTAINEROF(item,
                                                ^~~~~~~~~~~~~~~~~~~~~~~
    
    ../spice-common/spice-protocol/spice/macros.h:142:6: note: expanded
    from macro 'SPICE_CONTAINEROF'
    
     ((struct_type *)((uint8_t *)(ptr) - SPICE_OFFSETOF(struct_type, member)))
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/spice/macros.h b/spice/macros.h
index 034caf7..29cdf82 100644
--- a/spice/macros.h
+++ b/spice/macros.h
@@ -140,7 +140,7 @@
 #endif
 
 #define SPICE_CONTAINEROF(ptr, struct_type, member) \
-    ((struct_type *)((uint8_t *)(ptr) - SPICE_OFFSETOF(struct_type, member)))
+    ((struct_type *)(void *)((uint8_t *)(ptr) - SPICE_OFFSETOF(struct_type, member)))
 
 #define SPICE_MEMBER_P(struct_p, struct_offset)   \
     ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))