From 8dfdff7b603b99c39d2806f210c2a3bd69d739fb Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 12 Mar 2021 13:40:11 +0000 Subject: [PATCH] Guard inclusion of FileTypesAndCreators.h depending on presence. --- setter/src/macos/CMakeLists.txt | 5 +++++ 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, 47 insertions(+) diff --git a/setter/src/macos/CMakeLists.txt b/setter/src/macos/CMakeLists.txt index 5864cb6..1b9098c 100644 --- a/setter/src/macos/CMakeLists.txt +++ b/setter/src/macos/CMakeLists.txt @@ -13,12 +13,17 @@ add_definitions(-Dmacintosh) add_definitions(-DRetro68) CHECK_INCLUDE_FILES("Aliases.h" HAVE_ALIASES_H) +CHECK_INCLUDE_FILES("FileTypesAndCreators.h" HAVE_FILE_TYPES_AND_CREATORS_H) CHECK_INCLUDE_FILES("Multiverse.h" HAVE_MULTIVERSE_H) if(HAVE_ALIASES_H) add_definitions(-DHAVE_ALIASES_H) endif() +if(HAVE_FILE_TYPES_AND_CREATORS_H) + add_definitions(-DHAVE_FILE_TYPES_AND_CREATORS_H) +endif() + if(HAVE_MULTIVERSE_H) add_definitions(-DHAVE_MULTIVERSE_H) endif() diff --git a/setter/src/macos/attr.c b/setter/src/macos/attr.c index e761d0b..1aed4ee 100644 --- a/setter/src/macos/attr.c +++ b/setter/src/macos/attr.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 cb17855..37b8b9a 100644 --- a/setter/src/macos/deleted.c +++ b/setter/src/macos/deleted.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 6e7be69..2340502 100644 --- a/setter/src/macos/dirdepth.c +++ b/setter/src/macos/dirdepth.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 1533804..351c356 100644 --- a/setter/src/macos/filename.c +++ b/setter/src/macos/filename.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 3ac9e38..80cdcc1 100644 --- a/setter/src/macos/files.c +++ b/setter/src/macos/files.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 8da0aed..3f0f592 100644 --- a/setter/src/macos/frag.c +++ b/setter/src/macos/frag.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 01737ff..7b48ac6 100644 --- a/setter/src/macos/links.c +++ b/setter/src/macos/links.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 ee21dcc..35aa172 100644 --- a/setter/src/macos/os.c +++ b/setter/src/macos/os.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 113ad33..520004f 100644 --- a/setter/src/macos/perms.c +++ b/setter/src/macos/perms.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 bb95a31..7f92a8f 100644 --- a/setter/src/macos/rsrcfork.c +++ b/setter/src/macos/rsrcfork.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 5819bc0..699e018 100644 --- a/setter/src/macos/sparse.c +++ b/setter/src/macos/sparse.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 eaf00fb..45b285c 100644 --- a/setter/src/macos/time.c +++ b/setter/src/macos/time.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 cf591fb..0d46fc9 100644 --- a/setter/src/macos/volume.c +++ b/setter/src/macos/volume.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_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 d7d9c04..c47c64e 100644 --- a/setter/src/macos/xattr.c +++ b/setter/src/macos/xattr.c @@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo #include #endif +#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H) #include +#endif + #include #include #include