From 889512dbc7e394f1d0f57906059de1dfded21f08 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 12 Mar 2021 13:37:52 +0000 Subject: [PATCH] Guard inclusion of Aliases.h depending on presence. --- setter/src/macos/CMakeLists.txt | 14 ++++++++++++++ setter/src/macos/attr.c | 3 +++ setter/src/macos/deleted.c | 3 +++ setter/src/macos/dirdepth.c | 3 +++ setter/src/macos/filename.c | 3 +++ setter/src/macos/files.c | 3 +++ setter/src/macos/frag.c | 3 +++ setter/src/macos/links.c | 3 +++ setter/src/macos/os.c | 3 +++ setter/src/macos/perms.c | 3 +++ setter/src/macos/rsrcfork.c | 3 +++ setter/src/macos/sparse.c | 3 +++ setter/src/macos/time.c | 3 +++ setter/src/macos/volume.c | 3 +++ setter/src/macos/xattr.c | 3 +++ 15 files changed, 56 insertions(+) diff --git a/setter/src/macos/CMakeLists.txt b/setter/src/macos/CMakeLists.txt index 9218756..5864cb6 100644 --- a/setter/src/macos/CMakeLists.txt +++ b/setter/src/macos/CMakeLists.txt @@ -2,12 +2,26 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Retro68" AND NOT ${CMAKE_SYSTEM_NAME} MATCH return() endif() +include(CheckIncludeFiles) + project( fssetter-macos DESCRIPTION "Filesystem test creator for MacOS" LANGUAGES C) add_definitions(-Dmacintosh) +add_definitions(-DRetro68) + +CHECK_INCLUDE_FILES("Aliases.h" HAVE_ALIASES_H) +CHECK_INCLUDE_FILES("Multiverse.h" HAVE_MULTIVERSE_H) + +if(HAVE_ALIASES_H) + add_definitions(-DHAVE_ALIASES_H) +endif() + +if(HAVE_MULTIVERSE_H) + add_definitions(-DHAVE_MULTIVERSE_H) +endif() 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.c volume.c xattr.c macos.h macos.r) diff --git a/setter/src/macos/attr.c b/setter/src/macos/attr.c index 1e1bff6..e761d0b 100644 --- a/setter/src/macos/attr.c +++ b/setter/src/macos/attr.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/deleted.c b/setter/src/macos/deleted.c index 1b0960b..cb17855 100644 --- a/setter/src/macos/deleted.c +++ b/setter/src/macos/deleted.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/dirdepth.c b/setter/src/macos/dirdepth.c index 0009812..6e7be69 100644 --- a/setter/src/macos/dirdepth.c +++ b/setter/src/macos/dirdepth.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/filename.c b/setter/src/macos/filename.c index 28c8189..1533804 100644 --- a/setter/src/macos/filename.c +++ b/setter/src/macos/filename.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/files.c b/setter/src/macos/files.c index a54a2d6..3ac9e38 100644 --- a/setter/src/macos/files.c +++ b/setter/src/macos/files.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/frag.c b/setter/src/macos/frag.c index 67c0df8..8da0aed 100644 --- a/setter/src/macos/frag.c +++ b/setter/src/macos/frag.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/links.c b/setter/src/macos/links.c index cd0555a..01737ff 100644 --- a/setter/src/macos/links.c +++ b/setter/src/macos/links.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/os.c b/setter/src/macos/os.c index 0996f3f..ee21dcc 100644 --- a/setter/src/macos/os.c +++ b/setter/src/macos/os.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/perms.c b/setter/src/macos/perms.c index 62d64c0..113ad33 100644 --- a/setter/src/macos/perms.c +++ b/setter/src/macos/perms.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/rsrcfork.c b/setter/src/macos/rsrcfork.c index 381f6eb..bb95a31 100644 --- a/setter/src/macos/rsrcfork.c +++ b/setter/src/macos/rsrcfork.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/sparse.c b/setter/src/macos/sparse.c index 7ee06f1..5819bc0 100644 --- a/setter/src/macos/sparse.c +++ b/setter/src/macos/sparse.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/time.c b/setter/src/macos/time.c index 1934be5..eaf00fb 100644 --- a/setter/src/macos/time.c +++ b/setter/src/macos/time.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/volume.c b/setter/src/macos/volume.c index d0cd796..cf591fb 100644 --- a/setter/src/macos/volume.c +++ b/setter/src/macos/volume.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include diff --git a/setter/src/macos/xattr.c b/setter/src/macos/xattr.c index 3f02988..d7d9c04 100644 --- a/setter/src/macos/xattr.c +++ b/setter/src/macos/xattr.c @@ -29,7 +29,10 @@ Copyright (C) 2011-2021 Natalia Portillo #if defined(macintosh) +#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include