Fix 32-bit app crashing in 64-bit Android (v2)

[android-x86/external-libdrm.git] / android / gralloc_handle.h

diff --git a/android/gralloc_handle.h b/android/gralloc_handle.h
index bcf753d..d3d975e 100644 (file)
--- a/android/gralloc_handle.h
+++ b/android/gralloc_handle.h
@@ -60,16 +60,16 @@ struct gralloc_handle_t {
        uint32_t usage; /* android libhardware usage flags */
 
        uint32_t stride; /* the stride in bytes */
-       uint64_t modifier; /* buffer modifiers */
-
        int data_owner; /* owner of data (for validation) */
+       uint64_t modifier __attribute__((aligned(8))); /* buffer modifiers */
+
        union {
                void *data; /* pointer to struct gralloc_gbm_bo_t */
                uint64_t reserved;
        } __attribute__((aligned(8)));
 };
 
-#define GRALLOC_HANDLE_VERSION 3
+#define GRALLOC_HANDLE_VERSION 4
 #define GRALLOC_HANDLE_MAGIC 0x60585350
 #define GRALLOC_HANDLE_NUM_FDS 1
 #define GRALLOC_HANDLE_NUM_INTS (      \