From 15f0b7b53482ab58b0873f50d661d4f14aea4868 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 6 Apr 2021 04:04:18 +0100
Subject: [PATCH] Rename dos.h to dosdefs.h to prevent conflicts with older
 compilers.

---
 setter/src/dos/CMakeLists.txt       | 2 +-
 setter/src/dos/attr.c               | 2 +-
 setter/src/dos/deleted.c            | 2 +-
 setter/src/dos/dirdepth.c           | 2 +-
 setter/src/dos/dos.c                | 2 +-
 setter/src/dos/{dos.h => dosdefs.h} | 0
 setter/src/dos/filename.c           | 2 +-
 setter/src/dos/files.c              | 2 +-
 setter/src/dos/frag.c               | 2 +-
 setter/src/dos/os.c                 | 2 +-
 setter/src/dos/time.c               | 2 +-
 setter/src/dos/volume.c             | 2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename setter/src/dos/{dos.h => dosdefs.h} (100%)

diff --git a/setter/src/dos/CMakeLists.txt b/setter/src/dos/CMakeLists.txt
index d19b9b1..a253405 100644
--- a/setter/src/dos/CMakeLists.txt
+++ b/setter/src/dos/CMakeLists.txt
@@ -30,7 +30,7 @@ project(fssetter-dos
         DESCRIPTION "Filesystem test creator for DOS"
         LANGUAGES C)
 
-set(PLATFORM_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.h time.c volume.c xattr.c dos.c attr.h dosuname.c dosuname.h)
+set(PLATFORM_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.h time.c volume.c xattr.c dos.c attr.h dosuname.c dosuname.h dosdefs.h)
 
 set(EXECUTABLE_NAME "fssetter")
 
diff --git a/setter/src/dos/attr.c b/setter/src/dos/attr.c
index bb3102b..0581b6a 100644
--- a/setter/src/dos/attr.c
+++ b/setter/src/dos/attr.c
@@ -35,7 +35,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include "../include/defs.h"
 #include "../log.h"
 #include "attr.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void FileAttributes(const char* path)
 {
diff --git a/setter/src/dos/deleted.c b/setter/src/dos/deleted.c
index bf35932..ba27ee6 100644
--- a/setter/src/dos/deleted.c
+++ b/setter/src/dos/deleted.c
@@ -34,7 +34,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void DeleteFiles(const char* path)
 {
diff --git a/setter/src/dos/dirdepth.c b/setter/src/dos/dirdepth.c
index 23b2fca..2119cfd 100644
--- a/setter/src/dos/dirdepth.c
+++ b/setter/src/dos/dirdepth.c
@@ -34,7 +34,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void DirectoryDepth(const char* path)
 {
diff --git a/setter/src/dos/dos.c b/setter/src/dos/dos.c
index 84c5d3e..f8d24c6 100644
--- a/setter/src/dos/dos.c
+++ b/setter/src/dos/dos.c
@@ -34,7 +34,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <sys/movedata.h>
 #endif
 
-#include "dos.h"
+#include "dosdefs.h"
 
 unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t* diskspace)
 {
diff --git a/setter/src/dos/dos.h b/setter/src/dos/dosdefs.h
similarity index 100%
rename from setter/src/dos/dos.h
rename to setter/src/dos/dosdefs.h
diff --git a/setter/src/dos/filename.c b/setter/src/dos/filename.c
index 9653d20..75650fc 100644
--- a/setter/src/dos/filename.c
+++ b/setter/src/dos/filename.c
@@ -35,7 +35,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include "../include/consts.h"
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void Filenames(const char* path)
 {
diff --git a/setter/src/dos/files.c b/setter/src/dos/files.c
index 8a93076..3ee3ebd 100644
--- a/setter/src/dos/files.c
+++ b/setter/src/dos/files.c
@@ -34,7 +34,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void MillionFiles(const char* path)
 {
diff --git a/setter/src/dos/frag.c b/setter/src/dos/frag.c
index 5997778..a306a65 100644
--- a/setter/src/dos/frag.c
+++ b/setter/src/dos/frag.c
@@ -37,7 +37,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include "../include/consts.h"
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void Fragmentation(const char* path, size_t clusterSize)
 {
diff --git a/setter/src/dos/os.c b/setter/src/dos/os.c
index 608934e..0f0354e 100644
--- a/setter/src/dos/os.c
+++ b/setter/src/dos/os.c
@@ -32,7 +32,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 #include "dosuname.h"
 
 void GetOsInfo()
diff --git a/setter/src/dos/time.c b/setter/src/dos/time.c
index 2f8693c..7f9b4e8 100644
--- a/setter/src/dos/time.c
+++ b/setter/src/dos/time.c
@@ -35,7 +35,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 #include "time.h"
 
 void Timestamps(const char* path)
diff --git a/setter/src/dos/volume.c b/setter/src/dos/volume.c
index d73f88a..00b97f7 100644
--- a/setter/src/dos/volume.c
+++ b/setter/src/dos/volume.c
@@ -30,7 +30,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include "../include/defs.h"
 #include "../log.h"
-#include "dos.h"
+#include "dosdefs.h"
 
 void GetVolumeInfo(const char* path, size_t* clusterSize)
 {