From 2a2962bd3e7b6335ae66591cdcc748addeb8350d Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 11 Mar 2021 23:59:34 +0000
Subject: [PATCH] Use common actionTaken variable type for OS/2.

---
 setter/src/os2/attr.c | 6 ++----
 setter/src/os2/os2.h  | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/setter/src/os2/attr.c b/setter/src/os2/attr.c
index 82b0980..fb6934e 100644
--- a/setter/src/os2/attr.c
+++ b/setter/src/os2/attr.c
@@ -46,14 +46,12 @@ void FileAttributes(const char* path)
     char   drivePath[4];
     APIRET rc = 0, wRc = 0, cRc = 0;
     HFILE  handle;
-    int    i;
+    int        i;
+    ACTION_RET actionTaken = 0;
 
 // 32 bit
 #if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386))
-    ULONG       actionTaken = 0;
     FILESTATUS3 fileStatus  = {{0}};
-#else // 16 bit
-    USHORT actionTaken = 0;
 #endif
 
     drivePath[0] = path[0];
diff --git a/setter/src/os2/os2.h b/setter/src/os2/os2.h
index 4b2cb34..896f72e 100644
--- a/setter/src/os2/os2.h
+++ b/setter/src/os2/os2.h
@@ -39,6 +39,12 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define APIRET USHORT
 #endif
 
+#define ACTION_RET USHORT
+
+#else // 32 bit
+
+#define ACTION_RET ULONG
+
 #endif
 
 /* Information level types (defins method of query) */