From 49b5cd17011dfcd9900ccdee029ed042474cfc3e Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 11 Apr 2021 00:40:29 +0100
Subject: [PATCH] Fix OS/2 includes to not repeat including os2.h.

---
 setter/src/os2/attr.c    | 3 +++
 setter/src/os2/attr.h    | 5 +++++
 setter/src/os2/os2defs.h | 5 +++++
 setter/src/os2/volume.c  | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/setter/src/os2/attr.c b/setter/src/os2/attr.c
index da45648..cf23847 100644
--- a/setter/src/os2/attr.c
+++ b/setter/src/os2/attr.c
@@ -22,6 +22,9 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
+#define INCL_DOSMISC
+#define INCL_DOSFILEMGR
+
 #include <os2.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/setter/src/os2/attr.h b/setter/src/os2/attr.h
index b319584..2da5f85 100644
--- a/setter/src/os2/attr.h
+++ b/setter/src/os2/attr.h
@@ -25,7 +25,12 @@ Copyright (C) 2011-2021 Natalia Portillo
 #ifndef AARU_FSTESTER_SETTER_SRC_OS2_ATTR_H_
 #define AARU_FSTESTER_SETTER_SRC_OS2_ATTR_H_
 
+#ifndef OS2_INCLUDED
+#define INCL_DOSMISC
+#define INCL_DOSFILEMGR
+
 #include <os2.h>
+#endif
 
 typedef struct
 {
diff --git a/setter/src/os2/os2defs.h b/setter/src/os2/os2defs.h
index c986702..c720c46 100644
--- a/setter/src/os2/os2defs.h
+++ b/setter/src/os2/os2defs.h
@@ -25,7 +25,12 @@ Copyright (C) 2011-2021 Natalia Portillo
 #ifndef AARU_FSTESTER_SETTER_SRC_OS2_H
 #define AARU_FSTESTER_SETTER_SRC_OS2_H
 
+#ifndef OS2_INCLUDED
+#define INCL_DOSMISC
+#define INCL_DOSFILEMGR
+
 #include <os2.h>
+#endif
 
 #if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) // 16 bit
 
diff --git a/setter/src/os2/volume.c b/setter/src/os2/volume.c
index 8beb88f..439be43 100644
--- a/setter/src/os2/volume.c
+++ b/setter/src/os2/volume.c
@@ -33,7 +33,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include "../include/consts.h"
 #include "../include/defs.h"
 #include "../log.h"
-#include "os2.h"
+#include "os2defs.h"
 
 void GetVolumeInfo(const char* path, size_t* clusterSize)
 {