From 8b577ed5317f877daaf33a55240f75e499730c0a Mon Sep 17 00:00:00 2001 From: tkchin Date: Tue, 19 Apr 2016 10:04:41 -0700 Subject: [PATCH] Mark public ObjC APIs as explicitly visible. BUG= Review URL: https://codereview.webrtc.org/1899573002 Cr-Commit-Position: refs/heads/master@{#12431} --- webrtc/api/objc/RTCAVFoundationVideoSource.h | 2 ++ webrtc/api/objc/RTCAudioTrack.h | 2 ++ webrtc/api/objc/RTCConfiguration.h | 3 +++ webrtc/api/objc/RTCDataChannel.h | 6 +++++- webrtc/api/objc/RTCDataChannelConfiguration.h | 3 +++ webrtc/api/objc/RTCEAGLVideoView.h | 3 +++ webrtc/api/objc/RTCIceCandidate.h | 3 +++ webrtc/api/objc/RTCIceServer.h | 3 +++ webrtc/api/objc/RTCMediaConstraints.h | 3 +++ webrtc/api/objc/RTCMediaStream.h | 3 +++ webrtc/api/objc/RTCMediaStreamTrack.h | 3 +++ webrtc/api/objc/RTCOpenGLVideoRenderer.h | 3 +++ webrtc/api/objc/RTCPeerConnection.h | 5 ++++- webrtc/api/objc/RTCPeerConnectionFactory.h | 3 +++ webrtc/api/objc/RTCRtpEncodingParameters.h | 3 +++ webrtc/api/objc/RTCRtpParameters.h | 2 ++ webrtc/api/objc/RTCRtpSender.h | 3 +++ webrtc/api/objc/RTCSessionDescription.h | 3 +++ webrtc/api/objc/RTCStatsReport.h | 3 +++ webrtc/api/objc/RTCVideoFrame.h | 3 +++ webrtc/api/objc/RTCVideoRenderer.h | 3 +++ webrtc/api/objc/RTCVideoSource.h | 3 +++ webrtc/api/objc/RTCVideoTrack.h | 3 +++ webrtc/base/objc/RTCCameraPreviewView.h | 3 +++ webrtc/base/objc/RTCDispatcher.h | 3 +++ webrtc/base/objc/RTCFieldTrials.h | 6 +++--- webrtc/base/objc/RTCFileLogger.h | 3 +++ webrtc/base/objc/RTCLogging.h | 16 +++++----------- webrtc/base/objc/RTCMacros.h | 6 ++++-- webrtc/base/objc/RTCSSLAdapter.h | 4 ++-- webrtc/base/objc/RTCTracing.h | 8 ++++---- webrtc/base/objc/RTCUIApplication.h | 2 +- 32 files changed, 97 insertions(+), 25 deletions(-) diff --git a/webrtc/api/objc/RTCAVFoundationVideoSource.h b/webrtc/api/objc/RTCAVFoundationVideoSource.h index 8c0232a8d8..73e5585d37 100644 --- a/webrtc/api/objc/RTCAVFoundationVideoSource.h +++ b/webrtc/api/objc/RTCAVFoundationVideoSource.h @@ -9,6 +9,7 @@ */ #import "webrtc/api/objc/RTCVideoSource.h" +#import "webrtc/base/objc/RTCMacros.h" @class AVCaptureSession; @class RTCMediaConstraints; @@ -23,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN * guarantee its lifetime. Instead, we expose its properties through the ref * counted video source interface. */ +RTC_EXPORT @interface RTCAVFoundationVideoSource : RTCVideoSource - (instancetype)init NS_UNAVAILABLE; diff --git a/webrtc/api/objc/RTCAudioTrack.h b/webrtc/api/objc/RTCAudioTrack.h index b5ea649dc2..0f4b69d1ad 100644 --- a/webrtc/api/objc/RTCAudioTrack.h +++ b/webrtc/api/objc/RTCAudioTrack.h @@ -9,9 +9,11 @@ */ #import "webrtc/api/objc/RTCMediaStreamTrack.h" +#import "webrtc/base/objc/RTCMacros.h" NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCAudioTrack : RTCMediaStreamTrack - (instancetype)init NS_UNAVAILABLE; diff --git a/webrtc/api/objc/RTCConfiguration.h b/webrtc/api/objc/RTCConfiguration.h index 144c8d3bd5..38ae88daff 100644 --- a/webrtc/api/objc/RTCConfiguration.h +++ b/webrtc/api/objc/RTCConfiguration.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + @class RTCIceServer; /** @@ -50,6 +52,7 @@ typedef NS_ENUM(NSInteger, RTCEncryptionKeyType) { NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCConfiguration : NSObject /** An array of Ice Servers available to be used by ICE. */ diff --git a/webrtc/api/objc/RTCDataChannel.h b/webrtc/api/objc/RTCDataChannel.h index 59ab2b8b26..43d4663668 100644 --- a/webrtc/api/objc/RTCDataChannel.h +++ b/webrtc/api/objc/RTCDataChannel.h @@ -11,8 +11,11 @@ #import #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCDataBuffer : NSObject /** NSData representation of the underlying buffer. */ @@ -33,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @class RTCDataChannel; +RTC_EXPORT @protocol RTCDataChannelDelegate /** The data channel state changed. */ @@ -58,7 +62,7 @@ typedef NS_ENUM(NSInteger, RTCDataChannelState) { RTCDataChannelStateClosed, }; - +RTC_EXPORT @interface RTCDataChannel : NSObject /** diff --git a/webrtc/api/objc/RTCDataChannelConfiguration.h b/webrtc/api/objc/RTCDataChannelConfiguration.h index fbe342d2c8..d9e7059171 100644 --- a/webrtc/api/objc/RTCDataChannelConfiguration.h +++ b/webrtc/api/objc/RTCDataChannelConfiguration.h @@ -11,8 +11,11 @@ #import #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCDataChannelConfiguration : NSObject /** Set to YES if ordered delivery is required. */ diff --git a/webrtc/api/objc/RTCEAGLVideoView.h b/webrtc/api/objc/RTCEAGLVideoView.h index cd39881bde..afb092e68c 100644 --- a/webrtc/api/objc/RTCEAGLVideoView.h +++ b/webrtc/api/objc/RTCEAGLVideoView.h @@ -12,10 +12,12 @@ #import #import "webrtc/api/objc/RTCVideoRenderer.h" +#import "webrtc/base/objc/RTCMacros.h" NS_ASSUME_NONNULL_BEGIN @class RTCEAGLVideoView; +RTC_EXPORT @protocol RTCEAGLVideoViewDelegate - (void)videoView:(RTCEAGLVideoView *)videoView didChangeVideoSize:(CGSize)size; @@ -26,6 +28,7 @@ NS_ASSUME_NONNULL_BEGIN * RTCEAGLVideoView is an RTCVideoRenderer which renders video frames in its * bounds using OpenGLES 2.0. */ +RTC_EXPORT @interface RTCEAGLVideoView : UIView @property(nonatomic, weak) id delegate; diff --git a/webrtc/api/objc/RTCIceCandidate.h b/webrtc/api/objc/RTCIceCandidate.h index e521ae04f6..c1aa060f0a 100644 --- a/webrtc/api/objc/RTCIceCandidate.h +++ b/webrtc/api/objc/RTCIceCandidate.h @@ -10,8 +10,11 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCIceCandidate : NSObject /** diff --git a/webrtc/api/objc/RTCIceServer.h b/webrtc/api/objc/RTCIceServer.h index 487588ebc4..fe9076c38d 100644 --- a/webrtc/api/objc/RTCIceServer.h +++ b/webrtc/api/objc/RTCIceServer.h @@ -10,8 +10,11 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCIceServer : NSObject /** URI(s) for this server represented as NSStrings. */ diff --git a/webrtc/api/objc/RTCMediaConstraints.h b/webrtc/api/objc/RTCMediaConstraints.h index a8ad39142e..d726f7d192 100644 --- a/webrtc/api/objc/RTCMediaConstraints.h +++ b/webrtc/api/objc/RTCMediaConstraints.h @@ -10,8 +10,11 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCMediaConstraints : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/webrtc/api/objc/RTCMediaStream.h b/webrtc/api/objc/RTCMediaStream.h index 50ae7df925..d5de6d3dc0 100644 --- a/webrtc/api/objc/RTCMediaStream.h +++ b/webrtc/api/objc/RTCMediaStream.h @@ -10,12 +10,15 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN @class RTCAudioTrack; @class RTCPeerConnectionFactory; @class RTCVideoTrack; +RTC_EXPORT @interface RTCMediaStream : NSObject /** The audio tracks in this stream. */ diff --git a/webrtc/api/objc/RTCMediaStreamTrack.h b/webrtc/api/objc/RTCMediaStreamTrack.h index b8576bdf3b..5a0dcbfbc4 100644 --- a/webrtc/api/objc/RTCMediaStreamTrack.h +++ b/webrtc/api/objc/RTCMediaStreamTrack.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + /** * Represents the state of the track. This exposes the same states in C++. */ @@ -20,6 +22,7 @@ typedef NS_ENUM(NSInteger, RTCMediaStreamTrackState) { NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCMediaStreamTrack : NSObject /** diff --git a/webrtc/api/objc/RTCOpenGLVideoRenderer.h b/webrtc/api/objc/RTCOpenGLVideoRenderer.h index 729839c6a3..7a8d3fe182 100644 --- a/webrtc/api/objc/RTCOpenGLVideoRenderer.h +++ b/webrtc/api/objc/RTCOpenGLVideoRenderer.h @@ -15,6 +15,8 @@ #import #endif +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN @class RTCVideoFrame; @@ -23,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN // the currently bound framebuffer. Supports OpenGL 3.2 and OpenGLES 2.0. OpenGL // framebuffer creation and management should be handled elsewhere using the // same context used to initialize this class. +RTC_EXPORT @interface RTCOpenGLVideoRenderer : NSObject // The last successfully drawn frame. Used to avoid drawing frames unnecessarily diff --git a/webrtc/api/objc/RTCPeerConnection.h b/webrtc/api/objc/RTCPeerConnection.h index 471a8deef0..5acaa8093f 100644 --- a/webrtc/api/objc/RTCPeerConnection.h +++ b/webrtc/api/objc/RTCPeerConnection.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + @class RTCConfiguration; @class RTCDataChannel; @class RTCDataChannelConfiguration; @@ -65,6 +67,7 @@ typedef NS_ENUM(NSInteger, RTCStatsOutputLevel) { @class RTCPeerConnection; +RTC_EXPORT @protocol RTCPeerConnectionDelegate /** Called when the SignalingState changed. */ @@ -100,7 +103,7 @@ typedef NS_ENUM(NSInteger, RTCStatsOutputLevel) { @end - +RTC_EXPORT @interface RTCPeerConnection : NSObject /** The object that will be notifed about events such as state changes and diff --git a/webrtc/api/objc/RTCPeerConnectionFactory.h b/webrtc/api/objc/RTCPeerConnectionFactory.h index f98a551846..2a53cab16b 100644 --- a/webrtc/api/objc/RTCPeerConnectionFactory.h +++ b/webrtc/api/objc/RTCPeerConnectionFactory.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN @class RTCAVFoundationVideoSource; @@ -22,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN @class RTCVideoTrack; @protocol RTCPeerConnectionDelegate; +RTC_EXPORT @interface RTCPeerConnectionFactory : NSObject - (instancetype)init NS_DESIGNATED_INITIALIZER; diff --git a/webrtc/api/objc/RTCRtpEncodingParameters.h b/webrtc/api/objc/RTCRtpEncodingParameters.h index 8f7f22e04d..0fb17b2894 100644 --- a/webrtc/api/objc/RTCRtpEncodingParameters.h +++ b/webrtc/api/objc/RTCRtpEncodingParameters.h @@ -10,8 +10,11 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCRtpEncodingParameters : NSObject /** Controls whether the encoding is currently transmitted. */ diff --git a/webrtc/api/objc/RTCRtpParameters.h b/webrtc/api/objc/RTCRtpParameters.h index d38e9ef647..91d8108371 100644 --- a/webrtc/api/objc/RTCRtpParameters.h +++ b/webrtc/api/objc/RTCRtpParameters.h @@ -11,9 +11,11 @@ #import #import "webrtc/api/objc/RTCRtpEncodingParameters.h" +#import "webrtc/base/objc/RTCMacros.h" NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCRtpParameters : NSObject /** The currently active encodings in the order of preference. */ diff --git a/webrtc/api/objc/RTCRtpSender.h b/webrtc/api/objc/RTCRtpSender.h index 20d1db9b6a..34a3d6c616 100644 --- a/webrtc/api/objc/RTCRtpSender.h +++ b/webrtc/api/objc/RTCRtpSender.h @@ -12,9 +12,11 @@ #import "webrtc/api/objc/RTCMediaStreamTrack.h" #import "webrtc/api/objc/RTCRtpParameters.h" +#import "webrtc/base/objc/RTCMacros.h" NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @protocol RTCRtpSender /** The currently active RTCRtpParameters, as defined in @@ -36,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN @end +RTC_EXPORT @interface RTCRtpSender : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/webrtc/api/objc/RTCSessionDescription.h b/webrtc/api/objc/RTCSessionDescription.h index 2635633f39..de927cfbf3 100644 --- a/webrtc/api/objc/RTCSessionDescription.h +++ b/webrtc/api/objc/RTCSessionDescription.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + /** * Represents the session description type. This exposes the same types that are * in C++, which doesn't include the rollback type that is in the W3C spec. @@ -22,6 +24,7 @@ typedef NS_ENUM(NSInteger, RTCSdpType) { NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCSessionDescription : NSObject /** The type of session description. */ diff --git a/webrtc/api/objc/RTCStatsReport.h b/webrtc/api/objc/RTCStatsReport.h index f3f8907dfb..de80dc3363 100644 --- a/webrtc/api/objc/RTCStatsReport.h +++ b/webrtc/api/objc/RTCStatsReport.h @@ -10,9 +10,12 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN /** This does not currently conform to the spec. */ +RTC_EXPORT @interface RTCStatsReport : NSObject /** Time since 1970-01-01T00:00:00Z in milliseconds. */ diff --git a/webrtc/api/objc/RTCVideoFrame.h b/webrtc/api/objc/RTCVideoFrame.h index b44bf7331d..e76a9b3a5d 100644 --- a/webrtc/api/objc/RTCVideoFrame.h +++ b/webrtc/api/objc/RTCVideoFrame.h @@ -11,9 +11,12 @@ #import #import +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN // RTCVideoFrame is an ObjectiveC version of cricket::VideoFrame. +RTC_EXPORT @interface RTCVideoFrame : NSObject /** Width without rotation applied. */ diff --git a/webrtc/api/objc/RTCVideoRenderer.h b/webrtc/api/objc/RTCVideoRenderer.h index 2fe4efb45d..41c3e37ba5 100644 --- a/webrtc/api/objc/RTCVideoRenderer.h +++ b/webrtc/api/objc/RTCVideoRenderer.h @@ -13,10 +13,13 @@ #import #endif +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN @class RTCVideoFrame; +RTC_EXPORT @protocol RTCVideoRenderer /** The size of the frame. */ diff --git a/webrtc/api/objc/RTCVideoSource.h b/webrtc/api/objc/RTCVideoSource.h index a98fa6c6bb..026974409c 100644 --- a/webrtc/api/objc/RTCVideoSource.h +++ b/webrtc/api/objc/RTCVideoSource.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + typedef NS_ENUM(NSInteger, RTCSourceState) { RTCSourceStateInitializing, RTCSourceStateLive, @@ -19,6 +21,7 @@ typedef NS_ENUM(NSInteger, RTCSourceState) { NS_ASSUME_NONNULL_BEGIN +RTC_EXPORT @interface RTCVideoSource : NSObject /** The current state of the RTCVideoSource. */ diff --git a/webrtc/api/objc/RTCVideoTrack.h b/webrtc/api/objc/RTCVideoTrack.h index a7b6f0c90e..ff4196e5e2 100644 --- a/webrtc/api/objc/RTCVideoTrack.h +++ b/webrtc/api/objc/RTCVideoTrack.h @@ -10,12 +10,15 @@ #import "webrtc/api/objc/RTCMediaStreamTrack.h" +#import "webrtc/base/objc/RTCMacros.h" + NS_ASSUME_NONNULL_BEGIN @protocol RTCVideoRenderer; @class RTCPeerConnectionFactory; @class RTCVideoSource; +RTC_EXPORT @interface RTCVideoTrack : RTCMediaStreamTrack /** The video source for this video track. */ diff --git a/webrtc/base/objc/RTCCameraPreviewView.h b/webrtc/base/objc/RTCCameraPreviewView.h index 03e94c29ae..9fa4cd6cae 100644 --- a/webrtc/base/objc/RTCCameraPreviewView.h +++ b/webrtc/base/objc/RTCCameraPreviewView.h @@ -11,12 +11,15 @@ #import #import +#import "webrtc/base/objc/RTCMacros.h" + @class AVCaptureSession; @class RTCAVFoundationVideoSource; /** RTCCameraPreviewView is a view that renders local video from an * AVCaptureSession. */ +RTC_EXPORT @interface RTCCameraPreviewView : UIView /** The capture session being rendered in the view. Capture session diff --git a/webrtc/base/objc/RTCDispatcher.h b/webrtc/base/objc/RTCDispatcher.h index a9b92a661f..068544313e 100644 --- a/webrtc/base/objc/RTCDispatcher.h +++ b/webrtc/base/objc/RTCDispatcher.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + typedef NS_ENUM(NSInteger, RTCDispatcherQueueType) { // Main dispatcher queue. RTCDispatcherTypeMain, @@ -23,6 +25,7 @@ typedef NS_ENUM(NSInteger, RTCDispatcherQueueType) { /** Dispatcher that asynchronously dispatches blocks to a specific * shared dispatch queue. */ +RTC_EXPORT @interface RTCDispatcher : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/webrtc/base/objc/RTCFieldTrials.h b/webrtc/base/objc/RTCFieldTrials.h index 837a8f7a60..52e90fed3a 100644 --- a/webrtc/base/objc/RTCFieldTrials.h +++ b/webrtc/base/objc/RTCFieldTrials.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/objc/RTCMacros.h" - #import +#import "webrtc/base/objc/RTCMacros.h" + typedef NS_OPTIONS(NSUInteger, RTCFieldTrialOptions) { RTCFieldTrialOptionsNone = 0, RTCFieldTrialOptionsSendSideBwe = 1 << 0, @@ -20,4 +20,4 @@ typedef NS_OPTIONS(NSUInteger, RTCFieldTrialOptions) { /** Must be called before any other call into WebRTC. See: * webrtc/system_wrappers/include/field_trial_default.h */ -RTC_EXPORT void RTCInitFieldTrials(RTCFieldTrialOptions options); +RTC_EXTERN void RTCInitFieldTrials(RTCFieldTrialOptions options); diff --git a/webrtc/base/objc/RTCFileLogger.h b/webrtc/base/objc/RTCFileLogger.h index 281be4e31f..44ccb1c969 100644 --- a/webrtc/base/objc/RTCFileLogger.h +++ b/webrtc/base/objc/RTCFileLogger.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + typedef NS_ENUM(NSUInteger, RTCFileLoggerSeverity) { RTCFileLoggerSeverityVerbose, RTCFileLoggerSeverityInfo, @@ -31,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN // are preserved while the middle section is overwritten instead. // For kRTCFileLoggerTypeApp, the oldest log is overwritten. // This class is not threadsafe. +RTC_EXPORT @interface RTCFileLogger : NSObject // The severity level to capture. The default is kRTCFileLoggerSeverityInfo. diff --git a/webrtc/base/objc/RTCLogging.h b/webrtc/base/objc/RTCLogging.h index fbc4ffade2..ffeb65acee 100644 --- a/webrtc/base/objc/RTCLogging.h +++ b/webrtc/base/objc/RTCLogging.h @@ -10,6 +10,8 @@ #import +#import "webrtc/base/objc/RTCMacros.h" + // Subset of rtc::LoggingSeverity. typedef NS_ENUM(NSInteger, RTCLoggingSeverity) { RTCLoggingSeverityVerbose, @@ -18,24 +20,16 @@ typedef NS_ENUM(NSInteger, RTCLoggingSeverity) { RTCLoggingSeverityError, }; -#if defined(__cplusplus) -extern "C" void RTCLogEx(RTCLoggingSeverity severity, NSString* log_string); -extern "C" void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity); -extern "C" NSString* RTCFileName(const char* filePath); -#else - // Wrapper for C++ LOG(sev) macros. // Logs the log string to the webrtc logstream for the given severity. -extern void RTCLogEx(RTCLoggingSeverity severity, NSString* log_string); +RTC_EXTERN void RTCLogEx(RTCLoggingSeverity severity, NSString* log_string); // Wrapper for rtc::LogMessage::LogToDebug. // Sets the minimum severity to be logged to console. -extern void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity); +RTC_EXTERN void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity); // Returns the filename with the path prefix removed. -extern NSString* RTCFileName(const char* filePath); - -#endif +RTC_EXTERN NSString* RTCFileName(const char* filePath); // Some convenience macros. diff --git a/webrtc/base/objc/RTCMacros.h b/webrtc/base/objc/RTCMacros.h index 4979a2b87f..f9f15c37d3 100644 --- a/webrtc/base/objc/RTCMacros.h +++ b/webrtc/base/objc/RTCMacros.h @@ -11,10 +11,12 @@ #ifndef WEBRTC_BASE_OBJC_RTC_MACROS_H_ #define WEBRTC_BASE_OBJC_RTC_MACROS_H_ +#define RTC_EXPORT __attribute__((visibility("default"))) + #if defined(__cplusplus) -#define RTC_EXPORT extern "C" +#define RTC_EXTERN extern "C" RTC_EXPORT #else -#define RTC_EXPORT extern +#define RTC_EXTERN extern RTC_EXPORT #endif #ifdef __OBJC__ diff --git a/webrtc/base/objc/RTCSSLAdapter.h b/webrtc/base/objc/RTCSSLAdapter.h index 34db8432c2..bf275402ab 100644 --- a/webrtc/base/objc/RTCSSLAdapter.h +++ b/webrtc/base/objc/RTCSSLAdapter.h @@ -16,5 +16,5 @@ * Initialize and clean up the SSL library. Failure is fatal. These call the * corresponding functions in webrtc/base/ssladapter.h. */ -RTC_EXPORT BOOL RTCInitializeSSL(); -RTC_EXPORT BOOL RTCCleanupSSL(); +RTC_EXTERN BOOL RTCInitializeSSL(); +RTC_EXTERN BOOL RTCCleanupSSL(); diff --git a/webrtc/base/objc/RTCTracing.h b/webrtc/base/objc/RTCTracing.h index 5b8e2f6ac3..6f0596cfb7 100644 --- a/webrtc/base/objc/RTCTracing.h +++ b/webrtc/base/objc/RTCTracing.h @@ -12,10 +12,10 @@ #import "webrtc/base/objc/RTCMacros.h" -RTC_EXPORT void RTCSetupInternalTracer(); +RTC_EXTERN void RTCSetupInternalTracer(); /** Starts capture to specified file. Must be a valid writable path. * Returns YES if capture starts. */ -RTC_EXPORT BOOL RTCStartInternalCapture(NSString *filePath); -RTC_EXPORT void RTCStopInternalCapture(); -RTC_EXPORT void RTCShutdownInternalTracer(); +RTC_EXTERN BOOL RTCStartInternalCapture(NSString *filePath); +RTC_EXTERN void RTCStopInternalCapture(); +RTC_EXTERN void RTCShutdownInternalTracer(); diff --git a/webrtc/base/objc/RTCUIApplication.h b/webrtc/base/objc/RTCUIApplication.h index c06404f777..cd2817bd37 100644 --- a/webrtc/base/objc/RTCUIApplication.h +++ b/webrtc/base/objc/RTCUIApplication.h @@ -15,7 +15,7 @@ #if defined(WEBRTC_IOS) /** Convenience function to get UIApplicationState from C++. */ -RTC_EXPORT bool RTCIsUIApplicationActive(); +RTC_EXTERN bool RTCIsUIApplicationActive(); #endif // WEBRTC_IOS #endif // WEBRTC_BASE_OBJC_RTC_UI_APPLICATION_H_