From fcdf0e92c1a2d89188ec7b50fb9b40ef51362560 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Mon, 27 Dec 2021 08:33:54 -0800
Subject: [PATCH] Use upx_uint32_t, upx_uint64_t

Avoid complaints from x86_64-w64-mingw32-gcc (GCC) 9.3-win32 20200320
https://github.com/upx/upx/issues/545
	modified:   p_mach.h
---
 src/p_mach.h | 134 +++++++++++++++++++++++++--------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/p_mach.h b/src/p_mach.h
index b88d0d4c..8aebac17 100644
--- a/src/p_mach.h
+++ b/src/p_mach.h
@@ -1313,105 +1313,105 @@ protected:
 // (Fie on fuzzers!)
 
 struct dyld_info_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint32_t rebase_off;
-    uint32_t rebase_size;
-    uint32_t bind_off;
-    uint32_t bind_size;
-    uint32_t weak_bind_off;
-    uint32_t weak_bind_size;
-    uint32_t lazy_bind_off;
-    uint32_t lazy_bind_size;
-    uint32_t export_off;
-    uint32_t export_size;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint32_t rebase_off;
+    upx_uint32_t rebase_size;
+    upx_uint32_t bind_off;
+    upx_uint32_t bind_size;
+    upx_uint32_t weak_bind_off;
+    upx_uint32_t weak_bind_size;
+    upx_uint32_t lazy_bind_off;
+    upx_uint32_t lazy_bind_size;
+    upx_uint32_t export_off;
+    upx_uint32_t export_size;
 };
 union lc_str {
-    uint32_t offset;
+    upx_uint32_t offset;
 };
 
 struct dylib {
     union lc_str name;
-    uint32_t timestamp;
-    uint32_t current_version;
-    uint32_t compatibility_version;
+    upx_uint32_t timestamp;
+    upx_uint32_t current_version;
+    upx_uint32_t compatibility_version;
 };
 struct dylib_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
     struct dylib dylib;
 };
 struct dylinker_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
     union lc_str name;
 };
 struct encryption_info_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint32_t cryptoff;
-    uint32_t cryptsize;
-    uint32_t cryptid;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint32_t cryptoff;
+    upx_uint32_t cryptsize;
+    upx_uint32_t cryptid;
 };
 struct encryption_info_command_64 {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint32_t cryptoff;
-    uint32_t cryptsize;
-    uint32_t cryptid;
-    uint32_t pad;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint32_t cryptoff;
+    upx_uint32_t cryptsize;
+    upx_uint32_t cryptid;
+    upx_uint32_t pad;
 };
 struct entry_point_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint64_t entryoff;
-    uint64_t stacksize;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint64_t entryoff;
+    upx_uint64_t stacksize;
 };
 struct linkedit_data_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint32_t dataoff;
-    uint32_t datasize;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint32_t dataoff;
+    upx_uint32_t datasize;
 };
 struct rpath_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
     union lc_str path;
 };
 struct routines_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint32_t init_address;
-    uint32_t init_module;
-    uint32_t reserved1;
-    uint32_t reserved2;
-    uint32_t reserved3;
-    uint32_t reserved4;
-    uint32_t reserved5;
-    uint32_t reserved6;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint32_t init_address;
+    upx_uint32_t init_module;
+    upx_uint32_t reserved1;
+    upx_uint32_t reserved2;
+    upx_uint32_t reserved3;
+    upx_uint32_t reserved4;
+    upx_uint32_t reserved5;
+    upx_uint32_t reserved6;
 };
 struct routines_command_64 {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint64_t init_address;
-    uint64_t init_module;
-    uint64_t reserved1;
-    uint64_t reserved2;
-    uint64_t reserved3;
-    uint64_t reserved4;
-    uint64_t reserved5;
-    uint64_t reserved6;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint64_t init_address;
+    upx_uint64_t init_module;
+    upx_uint64_t reserved1;
+    upx_uint64_t reserved2;
+    upx_uint64_t reserved3;
+    upx_uint64_t reserved4;
+    upx_uint64_t reserved5;
+    upx_uint64_t reserved6;
 };
 struct uuid_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
     uint8_t uuid[16];
 };
 struct version_min_command {
-    uint32_t cmd;
-    uint32_t cmdsize;
-    uint32_t version;
-    uint32_t sdk;
+    upx_uint32_t cmd;
+    upx_uint32_t cmdsize;
+    upx_uint32_t version;
+    upx_uint32_t sdk;
 };
 
 #endif /* already included */