[PATCH 0/2] MR10145: include: Don't use expicit alignment for 64-bit types on PE targets.

[Jacek Caban (＠jacek)]

Those use correct alignment by default. Additional attributes cause GCC warnings that they ignored when used as C++ template parameters.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10145

[PATCH 1/2] include: Don't use expicit alignment for 64-bit msvcrt types on PE targets.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

---
 include/msvcrt/corecrt.h | 4 ++++
 include/msvcrt/stdio.h   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index b5bf31b728d..bbb140aa5c6 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -213,7 +213,11 @@ typedef __msvcrt_long __time32_t;
 #endif
 
 #ifndef _TIME64_T_DEFINED
+#if defined(_MSC_VER) || defined(__MINGW32__)
+typedef __int64 __time64_t;
+#else
 typedef __int64 DECLSPEC_ALIGN(8) __time64_t;
+#endif
 #define _TIME64_T_DEFINED
 #endif
 
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index 97526fe7ae1..50ece81fd59 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -46,7 +46,11 @@
 #endif
 
 #ifndef _FPOS_T_DEFINED
+#if defined(_MSC_VER) || defined(__MINGW32__)
+typedef __int64 fpos_t;
+#else
 typedef __int64 DECLSPEC_ALIGN(8) fpos_t;
+#endif
 #define _FPOS_T_DEFINED
 #endif
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10145

[PATCH 2/2] include: Don't use expicit alignment for 64-bit types on PE targets.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

---
 include/basetsd.h | 2 +-
 include/intsafe.h | 2 +-
 include/winnt.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/basetsd.h b/include/basetsd.h
index b3587da0342..47756508d9d 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -94,7 +94,7 @@ typedef signed int       LONG32, *PLONG32;
 typedef unsigned int     ULONG32, *PULONG32;
 typedef unsigned int     DWORD32, *PDWORD32;
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
 typedef signed __int64   INT64;
 typedef unsigned __int64 UINT64;
 typedef signed __int64   LONG64;
diff --git a/include/intsafe.h b/include/intsafe.h
index b922fa7c2de..eda0e1fec67 100644
--- a/include/intsafe.h
+++ b/include/intsafe.h
@@ -38,7 +38,7 @@ typedef int          LONG;
 typedef unsigned int ULONG;
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
 typedef signed __int64   INT64;
 typedef unsigned __int64 UINT64;
 typedef signed __int64   LONG64;
diff --git a/include/winnt.h b/include/winnt.h
index 373fd7705a9..d8d90954082 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -495,7 +495,7 @@ typedef ULONG           UCSCHAR;
 /* 'Extended/Wide' numerical types */
 #ifndef _ULONGLONG_
 # define _ULONGLONG_
-# ifdef _MSC_VER
+# if defined(_MSC_VER) || defined(__MINGW32__)
 typedef signed __int64   LONGLONG;
 typedef unsigned __int64 ULONGLONG;
 # else
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10145