Guard inclusion of FileTypesAndCreators.h depending on presence.

2025-12-16 19:24:39 +00:00 · 2021-03-12 13:40:11 +00:00
parent 06f45f0e35
commit 8dfdff7b60
15 changed files with 47 additions and 0 deletions
--- 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()
--- a/setter/src/macos/attr.c
+++ b/setter/src/macos/attr.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/deleted.c
+++ b/setter/src/macos/deleted.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/dirdepth.c
+++ b/setter/src/macos/dirdepth.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/filename.c
+++ b/setter/src/macos/filename.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/files.c
+++ b/setter/src/macos/files.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/frag.c
+++ b/setter/src/macos/frag.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/links.c
+++ b/setter/src/macos/links.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/os.c
+++ b/setter/src/macos/os.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/perms.c
+++ b/setter/src/macos/perms.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/rsrcfork.c
+++ b/setter/src/macos/rsrcfork.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/sparse.c
+++ b/setter/src/macos/sparse.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/time.c
+++ b/setter/src/macos/time.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/volume.c
+++ b/setter/src/macos/volume.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
--- a/setter/src/macos/xattr.c
+++ b/setter/src/macos/xattr.c
@@ -33,7 +33,10 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Aliases.h>
 #endif

+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
+#endif
+
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>