From 138c55f88719d9fdb485160ff5041b1e162ee085 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 11 Mar 2021 02:31:41 +0000 Subject: [PATCH] Fix chdir declaration in DJGPP vs Watcom. --- setter/src/dos/attr.c | 6 ++++++ setter/src/dos/deleted.c | 10 ++++++++++ setter/src/dos/dirdepth.c | 6 ++++++ setter/src/dos/filename.c | 6 ++++++ setter/src/dos/files.c | 6 ++++++ setter/src/dos/frag.c | 7 ++++++- setter/src/dos/links.c | 1 - setter/src/dos/os.c | 6 ++++++ setter/src/dos/perms.c | 6 ++++++ setter/src/dos/rsrcfork.c | 6 ++++++ setter/src/dos/sparse.c | 6 ++++++ setter/src/dos/time.c | 6 ++++++ setter/src/dos/volume.c | 6 ++++++ setter/src/dos/xattr.c | 6 ++++++ 14 files changed, 82 insertions(+), 2 deletions(-) diff --git a/setter/src/dos/attr.c b/setter/src/dos/attr.c index 34e194c..78919f9 100644 --- a/setter/src/dos/attr.c +++ b/setter/src/dos/attr.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/deleted.c b/setter/src/dos/deleted.c index 64aab9e..3d7fd2c 100644 --- a/setter/src/dos/deleted.c +++ b/setter/src/dos/deleted.c @@ -38,11 +38,21 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" #include "dos.h" +#include "../include/defs.h" +#include "../include/dosos2.h" +#include "dos.h" + void DeleteFiles(const char* path) { char driveNo = path[0] - '@'; diff --git a/setter/src/dos/dirdepth.c b/setter/src/dos/dirdepth.c index 296ec89..aa4d79c 100644 --- a/setter/src/dos/dirdepth.c +++ b/setter/src/dos/dirdepth.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/filename.c b/setter/src/dos/filename.c index 9558bef..c8d133d 100644 --- a/setter/src/dos/filename.c +++ b/setter/src/dos/filename.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/files.c b/setter/src/dos/files.c index 524b16d..14b37ab 100644 --- a/setter/src/dos/files.c +++ b/setter/src/dos/files.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/frag.c b/setter/src/dos/frag.c index ac98650..802e9d3 100644 --- a/setter/src/dos/frag.c +++ b/setter/src/dos/frag.c @@ -31,13 +31,18 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include -#include #include #include #include #include #include +#ifdef __WATCOMC__ +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/links.c b/setter/src/dos/links.c index b2d36f6..4e676ee 100644 --- a/setter/src/dos/links.c +++ b/setter/src/dos/links.c @@ -31,7 +31,6 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include -#include #include #include #include diff --git a/setter/src/dos/os.c b/setter/src/dos/os.c index bb713c3..d3473e5 100644 --- a/setter/src/dos/os.c +++ b/setter/src/dos/os.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/perms.c b/setter/src/dos/perms.c index fa6f5a2..966618e 100644 --- a/setter/src/dos/perms.c +++ b/setter/src/dos/perms.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/rsrcfork.c b/setter/src/dos/rsrcfork.c index 9198cee..faadfb6 100644 --- a/setter/src/dos/rsrcfork.c +++ b/setter/src/dos/rsrcfork.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/sparse.c b/setter/src/dos/sparse.c index da024df..7dca134 100644 --- a/setter/src/dos/sparse.c +++ b/setter/src/dos/sparse.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/time.c b/setter/src/dos/time.c index 10abce9..33fe4d3 100644 --- a/setter/src/dos/time.c +++ b/setter/src/dos/time.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/volume.c b/setter/src/dos/volume.c index c31c5a0..fcd66a0 100644 --- a/setter/src/dos/volume.c +++ b/setter/src/dos/volume.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h" diff --git a/setter/src/dos/xattr.c b/setter/src/dos/xattr.c index eb302a7..0947e9f 100644 --- a/setter/src/dos/xattr.c +++ b/setter/src/dos/xattr.c @@ -38,6 +38,12 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include +#if defined(__WATCOM__) +#include +#elif defined(__DJGPP__) +#include +#endif + #include "../include/consts.h" #include "../include/defs.h" #include "../include/dosos2.h"