Zebediah Figura : winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures.

Alexandre Julliard julliard at winehq.org
Mon Feb 22 15:43:20 CST 2021


Module: wine
Branch: master
Commit: 9638a5092e366181896b596507682d70519c9440
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9638a5092e366181896b596507682d70519c9440

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Fri Feb 19 20:34:58 2021 -0600

winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures.

The latter has inconsistent alignment between the Unix and Win32 sides.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winegstreamer/gst_private.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 03d19af1031..d2f6fee8971 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -150,17 +150,18 @@ struct wg_parser_event
         struct
         {
             /* pts and duration are in 100-nanosecond units. */
-            uint64_t pts, duration;
+            ULONGLONG pts, duration;
             uint32_t size;
             bool discontinuity, preroll, delta, has_pts, has_duration;
         } buffer;
         struct
         {
-            uint64_t position, stop;
-            double rate;
+            ULONGLONG position, stop;
+            DOUBLE rate;
         } segment;
     } u;
 };
+C_ASSERT(sizeof(struct wg_parser_event) == 40);
 
 struct unix_funcs
 {




More information about the wine-cvs mailing list