Rename os2.h to os2defs.h to prevent collision in old compilers.

setter/src/os2/16bit/os.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 GetOsInfo()
 {

setter/src/os2/16bit/xattr.c

@@ -35,7 +35,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 ExtendedAttributes(const char* path)
 {

setter/src/os2/32bit/os.c

@@ -23,7 +23,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
 #define INCL_DOSMISC
-#define INCL_DOSFILEMGR
 
 #include <os2.h>
 #include <stdio.h>
@@ -33,7 +32,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include "../../include/consts.h"
 #include "../../include/defs.h"
 #include "../../log.h"
-#include "../os2.h"
 
 void GetOsInfo()
 {

setter/src/os2/attr.c

@@ -22,9 +22,6 @@ 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>
@@ -35,7 +32,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 FileAttributes(const char* path)
 {

setter/src/os2/deleted.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 DeleteFiles(const char* path)
 {

setter/src/os2/dirdepth.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 DirectoryDepth(const char* path)
 {

setter/src/os2/filename.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 Filenames(const char* path)
 {

setter/src/os2/files.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 MillionFiles(const char* path)
 {

setter/src/os2/frag.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 Fragmentation(const char* path, size_t clusterSize)
 {

setter/src/os2/os2defs.h

@@ -75,7 +75,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #define __os2_chdir(path) DosChDir(path, 0)
 #define __os2_mkdir(path) DosMkDir(path, 0)
-#define __os2_delete(path) DosDelete(path, 0);
+#define __os2_delete(path) DosDelete(path, 0)
 
 #else // 32 bit
 

setter/src/os2/sparse.c

@@ -30,7 +30,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <stdlib.h>
 #include <string.h>
 
-#include "../os2.h"
+#include "../os2defs.h"
 #include "../include/consts.h"
 #include "../include/defs.h"
 

setter/src/os2/time.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"
 
 #define DATETIME_FORMAT "This file is dated %04d/%02d/%02d %02d:%02d:%02d for %s\n"