From 7c8582bde444f7d9d150f31c141e90434c429249 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 5 Apr 2021 21:47:32 +0100 Subject: [PATCH] Rename os2.h to os2defs.h to prevent collision in old compilers. --- setter/src/os2/16bit/os.c | 2 +- setter/src/os2/16bit/xattr.c | 2 +- setter/src/os2/32bit/os.c | 2 -- setter/src/os2/attr.c | 5 +---- setter/src/os2/deleted.c | 2 +- setter/src/os2/dirdepth.c | 2 +- setter/src/os2/filename.c | 2 +- setter/src/os2/files.c | 2 +- setter/src/os2/frag.c | 2 +- setter/src/os2/{os2.h => os2defs.h} | 2 +- setter/src/os2/sparse.c | 2 +- setter/src/os2/time.c | 2 +- 12 files changed, 11 insertions(+), 16 deletions(-) rename setter/src/os2/{os2.h => os2defs.h} (98%) diff --git a/setter/src/os2/16bit/os.c b/setter/src/os2/16bit/os.c index 4d32562..e51de9a 100644 --- a/setter/src/os2/16bit/os.c +++ b/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() { diff --git a/setter/src/os2/16bit/xattr.c b/setter/src/os2/16bit/xattr.c index 4d268f4..39a9870 100644 --- a/setter/src/os2/16bit/xattr.c +++ b/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) { diff --git a/setter/src/os2/32bit/os.c b/setter/src/os2/32bit/os.c index 0f04c84..c211adc 100644 --- a/setter/src/os2/32bit/os.c +++ b/setter/src/os2/32bit/os.c @@ -23,7 +23,6 @@ Copyright (C) 2011-2021 Natalia Portillo *****************************************************************************/ #define INCL_DOSMISC -#define INCL_DOSFILEMGR #include #include @@ -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() { diff --git a/setter/src/os2/attr.c b/setter/src/os2/attr.c index f9de58e..16959ab 100644 --- a/setter/src/os2/attr.c +++ b/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 #include #include @@ -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) { diff --git a/setter/src/os2/deleted.c b/setter/src/os2/deleted.c index 7afe788..919bbd8 100644 --- a/setter/src/os2/deleted.c +++ b/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) { diff --git a/setter/src/os2/dirdepth.c b/setter/src/os2/dirdepth.c index 6cc8a1b..d1a3beb 100644 --- a/setter/src/os2/dirdepth.c +++ b/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) { diff --git a/setter/src/os2/filename.c b/setter/src/os2/filename.c index 6140804..73f4d6d 100644 --- a/setter/src/os2/filename.c +++ b/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) { diff --git a/setter/src/os2/files.c b/setter/src/os2/files.c index 74670a9..b5f68ce 100644 --- a/setter/src/os2/files.c +++ b/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) { diff --git a/setter/src/os2/frag.c b/setter/src/os2/frag.c index 289fd30..133220b 100644 --- a/setter/src/os2/frag.c +++ b/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) { diff --git a/setter/src/os2/os2.h b/setter/src/os2/os2defs.h similarity index 98% rename from setter/src/os2/os2.h rename to setter/src/os2/os2defs.h index ea3e432..36b105d 100644 --- a/setter/src/os2/os2.h +++ b/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 diff --git a/setter/src/os2/sparse.c b/setter/src/os2/sparse.c index 9acb461..994d46f 100644 --- a/setter/src/os2/sparse.c +++ b/setter/src/os2/sparse.c @@ -30,7 +30,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include -#include "../os2.h" +#include "../os2defs.h" #include "../include/consts.h" #include "../include/defs.h" diff --git a/setter/src/os2/time.c b/setter/src/os2/time.c index 7f66e4e..831fba5 100644 --- a/setter/src/os2/time.c +++ b/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"