From a30b4b7ff8fc05081116997d9a15fbb327b7b11a Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 9 Jul 2020 15:06:48 -0400 Subject: [PATCH] fix Event structure alignment between C and D --- src/jtk/event.d | 5 +++-- src/jtk/jtk.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/jtk/event.d b/src/jtk/event.d index e92e04b..d7ab6df 100644 --- a/src/jtk/event.d +++ b/src/jtk/event.d @@ -8,7 +8,7 @@ import jtk.timer; struct Event { - enum Type : ubyte + enum : uint { WINDOW_CLOSE, WINDOW_EXPOSE, @@ -41,7 +41,8 @@ struct Event uint height; }; - Type type; + uint type; + uint _pad; union { KeyEvent key_event; diff --git a/src/jtk/jtk.c b/src/jtk/jtk.c index a5a4d1b..743f37d 100644 --- a/src/jtk/jtk.c +++ b/src/jtk/jtk.c @@ -339,7 +339,8 @@ typedef struct { } jtk_window_resize_event_t; typedef struct { - uint8_t type; + uint32_t type; + uint32_t _pad; union { jtk_key_event_t key_event; jtk_button_event_t button_event;