From 27d8b52e7ead0b186c8ae1dc30d3d15b54ca30cd Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 12 Mar 2021 00:14:03 +0000
Subject: [PATCH] Merge OS/2 permissions code.

---
 setter/src/os2/32bit/perms.c       | 49 ------------------------------
 setter/src/os2/{16bit => }/perms.c | 17 ++---------
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 setter/src/os2/32bit/perms.c
 rename setter/src/os2/{16bit => }/perms.c (76%)

diff --git a/setter/src/os2/32bit/perms.c b/setter/src/os2/32bit/perms.c
deleted file mode 100644
index 14b9be3..0000000
--- a/setter/src/os2/32bit/perms.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-Aaru Data Preservation Suite
------------------------------------------------------------------------------
-
-Filename       : os2_32.c
-Author(s)      : Natalia Portillo
-
---[ Description ] -----------------------------------------------------------
-
-Contains 32-bit OS/2 code
-
---[ License ] ---------------------------------------------------------------
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as
-     published by the Free Software Foundation, either version 3 of the
-     License, or (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
------------------------------------------------------------------------------
-Copyright (C) 2011-2021 Natalia Portillo
-*****************************************************************************/
-
-#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) &&                             \
-    (defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
-#define INCL_DOSMISC
-#define INCL_DOSFILEMGR
-
-#include <os2.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../os2.h"
-#include "include/consts.h"
-#include "include/defs.h"
-
-void FilePermissions(const char* path)
-{ /* Do nothing, not supported by target operating system */
-}
-
-#endif
diff --git a/setter/src/os2/16bit/perms.c b/setter/src/os2/perms.c
similarity index 76%
rename from setter/src/os2/16bit/perms.c
rename to setter/src/os2/perms.c
index 186dbbe..fd65bfd 100644
--- a/setter/src/os2/16bit/perms.c
+++ b/setter/src/os2/perms.c
@@ -27,23 +27,10 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
+#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
 
-#define INCL_DOSMISC
-#define INCL_DOSFILEMGR
-
-#include <os2.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../os2.h"
-#include "include/consts.h"
 #include "include/defs.h"
 
-void FilePermissions(const char* path)
-{ /* Do nothing, not supported by target operating system */
-}
+void FilePermissions(const char* path) { /* Do nothing, not supported by target operating system */ }
 
 #endif