Resolve feedbacks

Source/CrashReporter.h

@@ -32,10 +32,13 @@
 #import <AvailabilityMacros.h>
 #endif
 
+#if __has_include(<CrashReporter/PLCrashReport.h>)
+
 // This must be included before any other PLCrashReporter includes, as
 // it redefines symbol names
-#if __has_include(<CrashReporter/PLCrashNamespace.h>) && __has_include(<CrashReporter/PLCrashReporter.h>) && __has_include(<CrashReporter/PLCrashReport.h>) && __has_include(<CrashReporter/PLCrashReportTextFormatter.h>)
 #import <CrashReporter/PLCrashNamespace.h>
+
+/* Library Imports */
 #import <CrashReporter/PLCrashReporter.h>
 #import <CrashReporter/PLCrashReport.h>
 #import <CrashReporter/PLCrashReportTextFormatter.h>

Source/PLCrashLogWriter.m

@@ -40,7 +40,12 @@
 
 #import <stdatomic.h>
 
+#if __has_include(<CrashReporter/PLCrashReport.h>)
+#import <CrashReporter/PLCrashReport.h>
+#else
 #import "PLCrashReport.h"
+#endif
+
 #import "PLCrashLogWriter.h"
 #import "PLCrashLogWriterEncoding.h"
 #import "PLCrashAsyncSignalInfo.h"

Source/PLCrashReport.h

@@ -28,8 +28,10 @@
 
 #import <Foundation/Foundation.h>
 
-#if __has_include(<CrashReporter/PLCrashReportApplicationInfo.h>) && __has_include(<CrashReporter/PLCrashReportBinaryImageInfo.h>) && __has_include(<CrashReporter/PLCrashReportExceptionInfo.h>) && __has_include(<CrashReporter/PLCrashReportMachineInfo.h>) && __has_include(<CrashReporter/PLCrashReportMachExceptionInfo.h>) && __has_include(<CrashReporter/PLCrashReportProcessInfo.h>) && __has_include(<CrashReporter/PLCrashReportProcessorInfo.h>) && __has_include(<CrashReporter/PLCrashReportRegisterInfo.h>) && __has_include(<CrashReporter/PLCrashReportSignalInfo.h>) && __has_include(<CrashReporter/PLCrashReportStackFrameInfo.h>) && __has_include(<CrashReporter/PLCrashReportSymbolInfo.h>) && __has_include(<CrashReporter/PLCrashReportSystemInfo.h>) && __has_include(<CrashReporter/PLCrashReportThreadInfo.h>)
+#ifndef PLCRASH_REPORT_H
+#define PLCRASH_REPORT_H
 
+#if __has_include(<CrashReporter/PLCrashReportApplicationInfo.h>)
 #import <CrashReporter/PLCrashReportApplicationInfo.h>
 #import <CrashReporter/PLCrashReportBinaryImageInfo.h>
 #import <CrashReporter/PLCrashReportExceptionInfo.h>
@@ -224,3 +226,5 @@ typedef struct _PLCrashReportDecoder _PLCrashReportDecoder;
 @property(nonatomic, readonly) CFUUIDRef uuidRef;
 
 @end
+
+#endif

Source/PLCrashReport.m

@@ -26,13 +26,14 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if __has_include(<CrashReporter/PLCrashReporter.h>) && __has_include(<CrashReporter/PLCrashReport.h>)
+#if __has_include(<CrashReporter/PLCrashReport.h>)
 #import <CrashReporter/CrashReporter.h>
 #import <CrashReporter/PLCrashReport.h>
 #else
-#import "PLCrashReporter.h"
+#import "CrashReporter.h"
 #import "PLCrashReport.h"
 #endif
+
 #import "PLCrashReport.pb-c.h"
 #import "PLCrashAsyncThread.h"
 

Source/PLCrashReportBinaryImageInfo.h

@@ -27,6 +27,7 @@
  */
 
 #import <Foundation/Foundation.h>
+
 #if __has_include(<CrashReporter/PLCrashReportProcessorInfo.h>)
 #import <CrashReporter/PLCrashReportProcessorInfo.h>
 #else

Source/PLCrashReportBinaryImageInfo.m

@@ -26,7 +26,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if __has_include(<CrashReporter/PLCrashReportBinaryImageInfo.h>)
+#import <CrashReporter/PLCrashReportBinaryImageInfo.h>
+#else
 #import "PLCrashReportBinaryImageInfo.h"
+#endif
 
 /**
  * Crash Log binary image info. Represents an executable or shared library.

Source/PLCrashReportExceptionInfo.h

@@ -34,7 +34,6 @@
 #import "PLCrashReportThreadInfo.h"
 #endif
 
-
 @interface PLCrashReportExceptionInfo : NSObject {
 @private
     /** Name */

Source/PLCrashReportExceptionInfo.m

@@ -26,7 +26,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if __has_include(<CrashReporter/PLCrashReportExceptionInfo.h>)
+#import <CrashReporter/PLCrashReportExceptionInfo.h>
+#else
 #import "PLCrashReportExceptionInfo.h"
+#endif
 
 /**
  * If a crash is triggered by an uncaught Objective-C exception, the exception name and reason will be made available.

Source/PLCrashReportMachineInfo.m

@@ -26,7 +26,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if __has_include(<CrashReporter/PLCrashReportMachineInfo.h>)
+#import <CrashReporter/PLCrashReportMachineInfo.h>
+#else
 #import "PLCrashReportMachineInfo.h"
+#endif
 
 /**
  * Crash log host architecture information.

Source/PLCrashReportStackFrameInfo.h

@@ -27,6 +27,7 @@
  */
 
 #import <Foundation/Foundation.h>
+
 #if __has_include(<CrashReporter/PLCrashReportSymbolInfo.h>)
 #import <CrashReporter/PLCrashReportSymbolInfo.h>
 #else

Source/PLCrashReportStackFrameInfo.m

@@ -26,7 +26,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if __has_include(<CrashReporter/PLCrashReportStackFrameInfo.h>)
+#import <CrashReporter/PLCrashReportStackFrameInfo.h>
+#else
 #import "PLCrashReportStackFrameInfo.h"
+#endif
 
 /**
  * Crash log stack frame information.

Source/PLCrashReportSystemInfo.m

@@ -26,8 +26,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if __has_include(<CrashReporter/PLCrashReportSystemInfo.h>)
+#import <CrashReporter/PLCrashReportSystemInfo.h>
+#import <CrashReporter/PLCrashReportProcessorInfo.h>
+#else
 #import "PLCrashReportSystemInfo.h"
 #import "PLCrashReportProcessorInfo.h"
+#endif
 
 /**
  * @ingroup constants

Source/PLCrashReportThreadInfo.h

@@ -28,10 +28,10 @@
 
 #import <Foundation/Foundation.h>
 
-#ifndef PLCRASH_REPORT_THREAD_INFO
-#define PLCRASH_REPORT_THREAD_INFO
+#ifndef PLCRASH_REPORT_THREAD_INFO_H
+#define PLCRASH_REPORT_THREAD_INFO_H
 
-#if __has_include(<CrashReporter/PLCrashReportStackFrameInfo.h>) && __has_include(<CrashReporter/PLCrashReportRegisterInfo.h>)
+#if __has_include(<CrashReporter/PLCrashReportStackFrameInfo.h>)
 #import <CrashReporter/PLCrashReportStackFrameInfo.h>
 #import <CrashReporter/PLCrashReportRegisterInfo.h>
 #else
@@ -84,4 +84,5 @@
 @property(nonatomic, readonly, strong) NSArray *registers;
 
 @end
+
 #endif

Source/PLCrashReportThreadInfo.m

@@ -26,7 +26,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if __has_include(<CrashReporter/PLCrashReportThreadInfo.h>)
+#import <CrashReporter/PLCrashReportThreadInfo.h>
+#else
 #import "PLCrashReportThreadInfo.h"
+#endif
 
 /**
  * Crash log per-thread state information.

Source/PLCrashReporter.h

@@ -29,7 +29,10 @@
 #import <Foundation/Foundation.h>
 #import <mach/mach.h>
 
-#if __has_include(<CrashReporter/PLCrashReporterConfig.h>) && __has_include(<CrashReporter/PLCrashMacros.h>)
+#ifndef PLCRASH_REPORTER_H
+#define PLCRASH_REPORTER_H
+
+#if __has_include(<CrashReporter/PLCrashReporterConfig.h>)
 #import <CrashReporter/PLCrashReporterConfig.h>
 #import <CrashReporter/PLCrashMacros.h>
 #else
@@ -142,3 +145,5 @@ typedef struct PLCrashReporterCallbacks {
 @property(nonatomic, strong) NSData *customData;
 
 @end
+
+#endif

Source/PLCrashReporter.m

@@ -26,8 +26,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "PLCrashReporter.h"
+#if __has_include(<CrashReporter/CrashReporter.h>)
+#import <CrashReporter/CrashReporter.h>
+#import <CrashReporter/PLCrashReporter.h>
+#else
 #import "CrashReporter.h"
+#import "PLCrashReporter.h"
+#endif
 
 #import "PLCrashFeatureConfig.h"
 

Source/PLCrashReporterNSError.h

@@ -27,9 +27,16 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "CrashReporter.h"
 
+#if __has_include(<CrashReporter/CrashReporter.h>) \
+    && __has_include(<CrashReporter/PLCrashMacros.h>)
+#import <CrashReporter/CrashReporter.h>
+#import <CrashReporter/PLCrashMacros.h>
+#else
+#import "CrashReporter.h"
 #import "PLCrashMacros.h"
+#endif
+
 
 PLCR_EXPORT void plcrash_populate_error (NSError **error, PLCrashReporterError code, NSString *description, NSError *cause);
 PLCR_EXPORT void plcrash_populate_mach_error (NSError **error, kern_return_t kr, NSString *description);