commit 320c1f098bfd68b0fdd834c7de741c79040efbf9
author Boris Zbarsky <bzbarsky@apple.com> Thu Mar 14 20:38:19 2024 -0400
committer GitHub <noreply@github.com> Thu Mar 14 17:38:19 2024 -0700
tree 26f732fbd9f3083c9fa6333cd2bc203aa08c24d2
parent 0aa09e0d99ffee39a72990250a22ee1153089f0d

MTR_EXTERN should not imply MTR_EXPORT. (#32580)

Most things using MTR_EXTERN had availability annotations anyway, which imply
MTR_EXPORT.

src/darwin/Framework/CHIP/MTRDefines.h

diff --git a/src/darwin/Framework/CHIP/MTRDefines.h b/src/darwin/Framework/CHIP/MTRDefines.h
index fea32d4..fb8fed4 100644
--- a/src/darwin/Framework/CHIP/MTRDefines.h
+++ b/src/darwin/Framework/CHIP/MTRDefines.h
@@ -51,9 +51,9 @@
 #define MTR_EXPORT __attribute__((visibility("default")))
 
 #ifdef __cplusplus
-#define MTR_EXTERN extern "C" MTR_EXPORT
+#define MTR_EXTERN extern "C"
 #else
-#define MTR_EXTERN extern MTR_EXPORT
+#define MTR_EXTERN extern
 #endif
 
 #if __has_attribute(__swift_attr__)

src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h b/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h
index 915834e..92670f1 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h
@@ -22,7 +22,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-MTR_EXTERN @interface MTRDeviceControllerLocalTestStorage : NSObject<MTRDeviceControllerStorageDelegate>
+MTR_EXTERN MTR_EXPORT @interface MTRDeviceControllerLocalTestStorage : NSObject<MTRDeviceControllerStorageDelegate>
 
 // Setting this variable only affects subsequent MTRDeviceController initializations
 @property (class, nonatomic, assign) BOOL localTestStorageEnabled;