From 09c9ef5cba5bdaee7c164918315416713946c87e Mon Sep 17 00:00:00 2001
From: NikolaiMadlener <nikolai@madlener.io>
Date: Mon, 18 Nov 2024 14:36:20 +0100
Subject: [PATCH] fix conditionals in header files

---
 ResearchKit/Common/ORKAnswerFormat.h             | 2 +-
 ResearchKit/Common/ORKAnswerFormat_Private.h     | 2 ++
 ResearchKit/Common/ORKCollectionResult.h         | 1 +
 ResearchKit/Common/ORKCollectionResult_Private.h | 1 +
 ResearchKit/Common/ORKFormStep.h                 | 1 +
 ResearchKit/Common/ORKInstructionStep.h          | 1 +
 ResearchKit/Common/ORKOrderedTask.h              | 1 +
 ResearchKit/Common/ORKResult.h                   | 1 +
 ResearchKit/Common/ORKTask.h                     | 2 +-
 ResearchKit/Common/ORKTypes.h                    | 1 +
 10 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ResearchKit/Common/ORKAnswerFormat.h b/ResearchKit/Common/ORKAnswerFormat.h
index 9d9773c8f..4bc57ef25 100644
--- a/ResearchKit/Common/ORKAnswerFormat.h
+++ b/ResearchKit/Common/ORKAnswerFormat.h
@@ -55,6 +55,7 @@
 @class ORKLocationAnswerFormat;
 @class ORKSESAnswerFormat;
 @class ORKImageChoice;
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -437,7 +438,6 @@ ORK_CLASS_AVAILABLE
 
 @end
 
-#if TARGET_OS_IOS || TARGET_OS_VISION
 @interface ORKAnswerFormat()
 
 /// @name Factory methods
diff --git a/ResearchKit/Common/ORKAnswerFormat_Private.h b/ResearchKit/Common/ORKAnswerFormat_Private.h
index a6bd84740..20c7516b0 100644
--- a/ResearchKit/Common/ORKAnswerFormat_Private.h
+++ b/ResearchKit/Common/ORKAnswerFormat_Private.h
@@ -32,6 +32,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKAnswerFormat.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -93,6 +94,7 @@ ORK_CLASS_AVAILABLE
 @property (nonatomic, copy, readonly) NSString *errorMessage;
 
 @end
+#endif
 
 @protocol ORKAnswerFormatPlatterPresentable <NSObject>
 
diff --git a/ResearchKit/Common/ORKCollectionResult.h b/ResearchKit/Common/ORKCollectionResult.h
index 1d9a03ddf..c8a854261 100644
--- a/ResearchKit/Common/ORKCollectionResult.h
+++ b/ResearchKit/Common/ORKCollectionResult.h
@@ -30,6 +30,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKResult.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ResearchKit/Common/ORKCollectionResult_Private.h b/ResearchKit/Common/ORKCollectionResult_Private.h
index 2a7e788e7..840f8b396 100644
--- a/ResearchKit/Common/ORKCollectionResult_Private.h
+++ b/ResearchKit/Common/ORKCollectionResult_Private.h
@@ -33,6 +33,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKCollectionResult.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ResearchKit/Common/ORKFormStep.h b/ResearchKit/Common/ORKFormStep.h
index 3962ec6af..8fdc93afa 100644
--- a/ResearchKit/Common/ORKFormStep.h
+++ b/ResearchKit/Common/ORKFormStep.h
@@ -36,6 +36,7 @@
 #import <ResearchKit/ORKStep.h>
 #import <ResearchKit/ORKDefines.h>
 #import <ResearchKit/ORKStep.h>
+#endif
 
 /**
  Values that determine the style
diff --git a/ResearchKit/Common/ORKInstructionStep.h b/ResearchKit/Common/ORKInstructionStep.h
index 443ca57e4..0d1f2d9bf 100644
--- a/ResearchKit/Common/ORKInstructionStep.h
+++ b/ResearchKit/Common/ORKInstructionStep.h
@@ -34,6 +34,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKStep.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ResearchKit/Common/ORKOrderedTask.h b/ResearchKit/Common/ORKOrderedTask.h
index 2857ab8e8..890330842 100644
--- a/ResearchKit/Common/ORKOrderedTask.h
+++ b/ResearchKit/Common/ORKOrderedTask.h
@@ -34,6 +34,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKTask.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ResearchKit/Common/ORKResult.h b/ResearchKit/Common/ORKResult.h
index 7063946d9..37ddc6ffa 100644
--- a/ResearchKit/Common/ORKResult.h
+++ b/ResearchKit/Common/ORKResult.h
@@ -32,6 +32,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKTypes.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ResearchKit/Common/ORKTask.h b/ResearchKit/Common/ORKTask.h
index e13dcbbf4..4dbb5ef5c 100644
--- a/ResearchKit/Common/ORKTask.h
+++ b/ResearchKit/Common/ORKTask.h
@@ -33,7 +33,7 @@
 
 #if ORK_FEATURE_HEALTHKIT_AUTHORIZATION
 #import <HealthKit/HealthKit.h>
-
+#endif
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKTypes.h>
diff --git a/ResearchKit/Common/ORKTypes.h b/ResearchKit/Common/ORKTypes.h
index 43596cc59..56c101b7e 100644
--- a/ResearchKit/Common/ORKTypes.h
+++ b/ResearchKit/Common/ORKTypes.h
@@ -34,6 +34,7 @@
 
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import <ResearchKit/ORKDefines.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN