Merge 8682504 into 20742ca

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Fix typo in BUILD_LIBRARY_FOR_DISTRIBUTION variable in Makefile (#3488)
 - Remove dispatch queue metadata collection to fix crash (#3522)
+- Move header reference out of "extern C" (#3538)
 
 ## 8.18.0
 
@@ -28,7 +29,6 @@
 - Fix a race condition in SentryTracer (#3523)
 - App start ends when first frame is drawn when performanceV2 is enabled (#3530)
 - Use correct rendered frames timestamp for TTID/TTFD and app start (#3531)
-
 - Missing transactions when not calling `reportFullyDisplayed` (#3477)
 - Don't override `sentry-trace` and `baggage` headers (#3540)
 

Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.h

@@ -28,14 +28,14 @@
 #ifndef HDR_SentryCrashMachineContext_h
 #define HDR_SentryCrashMachineContext_h
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "SentryCrashThread.h"
 #include <mach/mach.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Suspend the runtime environment.
  */
 void sentrycrashmc_suspendEnvironment(

Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.h

@@ -26,15 +26,14 @@
 #ifndef SentryCrashStackCursor_h
 #define SentryCrashStackCursor_h
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "SentryCrashMachineContext.h"
-
 #include <stdbool.h>
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SentryCrashSC_CONTEXT_SIZE 100
 
 /** Point at which to give up walking a stack and consider it a stack overflow.

Sources/SentryCrash/Recording/Tools/SentryCrashThread.h

@@ -28,13 +28,13 @@
 #ifndef HDR_SentryCrashThread_h
 #define HDR_SentryCrashThread_h
 
+#include <stdbool.h>
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <sys/types.h>
-
 typedef uintptr_t SentryCrashThread;
 
 /** Get a thread's name. Internally, a thread name will