$ diff -u X.h X.h_preferred
--- X.h 2024-03-31 17:24:19.640385400 +1100
+++ X.h_preferred       2024-03-31 20:33:02.097334700 +1100
@@ -40,10 +40,8 @@

 /* Resources */

-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN64)
 typedef __int64 XID;
-#else
-typedef unsigned long long XID;
 #endif

##</code><code>##

$ diff -u X.h X.h_preferred
--- X.h 2024-03-31 17:24:19.640385400 +1100
+++ X.h_preferred       2024-04-01 10:05:59.718400900 +1100
@@ -40,10 +40,10 @@

 /* Resources */

-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN64)
 typedef __int64 XID;
 #else
-typedef unsigned long long XID;
+typedef unsigned long XID;
 #endif

 typedef XID Window;