Skip to content

Commit e616004

Browse files
leptos-nullkirb
leptos-null
authored and
kirb
committed
[global] Fix more external variable declarations
In 24ad952, I changed all external declarations to be enclosed in __{BEGIN,END}_DECLS which is sufficient for functions, but not for variables in C++. Please refer to #30 for further information. This effectively reverts much, but not all, of 24ad952
1 parent 10c2128 commit e616004

File tree

4 files changed

+79
-79
lines changed

4 files changed

+79
-79
lines changed

‎GraphicsServices/GSCapability.h‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -62,100 +62,100 @@ Boolean GSSystemGetTelephonyCapability(void); ///< Returns if the device has
6262
CFPropertyListRef GSSystemCopySubcapability(CFStringRef capability, CFStringRef subcapability);
6363
CFPropertyListRef GSSystemCopyCapability(CFStringRef capability); ///< Copy the value of a capability.
6464

65-
CFStringRef kGSCapabilityChangedNotification;
65+
extern CFStringRef kGSCapabilityChangedNotification;
6666

67-
CFStringRef kGSCameraRestriction;
68-
CFStringRef kGSInAppPurchasesRestriction;
69-
CFStringRef kGSVolumeLimitRestriction;
67+
extern CFStringRef kGSCameraRestriction;
68+
extern CFStringRef kGSInAppPurchasesRestriction;
69+
extern CFStringRef kGSVolumeLimitRestriction;
7070

71-
CFStringRef kGSDeviceNameString;
72-
CFStringRef kGSLocalizedDeviceNameString;
71+
extern CFStringRef kGSDeviceNameString;
72+
extern CFStringRef kGSLocalizedDeviceNameString;
7373

74-
CFStringRef kGSTelephonyMaximumGeneration;
74+
extern CFStringRef kGSTelephonyMaximumGeneration;
7575

7676
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_1
77-
CFStringRef kGSARMV6ExecutionCapability;
78-
CFStringRef kGSARMV7ExecutionCapability;
77+
extern CFStringRef kGSARMV6ExecutionCapability;
78+
extern CFStringRef kGSARMV7ExecutionCapability;
7979
#endif
80-
CFStringRef kGSAccelerometerCapability;
81-
CFStringRef kGSAccessibilityCapability;
82-
CFStringRef kGSAppleInternalInstallCapability;
83-
CFStringRef kGSApplicationInstallationCapability;
84-
CFStringRef kGSAutoFocusCameraCapability;
85-
CFStringRef kGSBluetoothCapability;
86-
CFStringRef kGSCameraCapability;
87-
CFStringRef kGSDelaySleepForHeadsetClickCapability;
88-
CFStringRef kGSDisplayFCCLogosViaSoftwareCapability;
89-
CFStringRef kGSDisplayIdentifiersCapability;
90-
CFStringRef kGSEncodeAACCapability;
91-
CFStringRef kGSEncryptedDataPartitionCapability;
92-
CFStringRef kGSExplicitContentRestriction;
93-
CFStringRef kGSGPSCapability;
94-
CFStringRef kGSGasGaugeBatteryCapability;
95-
CFStringRef kGSGreenTeaDeviceCapability;
96-
CFStringRef kGSHasAllFeaturesCapability;
97-
CFStringRef kGSInternationalSettingsCapability;
98-
CFStringRef kGSLaunchApplicationsWhileAnimatingCapability;
99-
CFStringRef kGSLoadThumbnailsWhileScrollingCapability;
100-
CFStringRef kGSLocationServicesCapability;
101-
CFStringRef kGSMMSCapability;
102-
CFStringRef kGSMagnetometerCapability;
80+
extern CFStringRef kGSAccelerometerCapability;
81+
extern CFStringRef kGSAccessibilityCapability;
82+
extern CFStringRef kGSAppleInternalInstallCapability;
83+
extern CFStringRef kGSApplicationInstallationCapability;
84+
extern CFStringRef kGSAutoFocusCameraCapability;
85+
extern CFStringRef kGSBluetoothCapability;
86+
extern CFStringRef kGSCameraCapability;
87+
extern CFStringRef kGSDelaySleepForHeadsetClickCapability;
88+
extern CFStringRef kGSDisplayFCCLogosViaSoftwareCapability;
89+
extern CFStringRef kGSDisplayIdentifiersCapability;
90+
extern CFStringRef kGSEncodeAACCapability;
91+
extern CFStringRef kGSEncryptedDataPartitionCapability;
92+
extern CFStringRef kGSExplicitContentRestriction;
93+
extern CFStringRef kGSGPSCapability;
94+
extern CFStringRef kGSGasGaugeBatteryCapability;
95+
extern CFStringRef kGSGreenTeaDeviceCapability;
96+
extern CFStringRef kGSHasAllFeaturesCapability;
97+
extern CFStringRef kGSInternationalSettingsCapability;
98+
extern CFStringRef kGSLaunchApplicationsWhileAnimatingCapability;
99+
extern CFStringRef kGSLoadThumbnailsWhileScrollingCapability;
100+
extern CFStringRef kGSLocationServicesCapability;
101+
extern CFStringRef kGSMMSCapability;
102+
extern CFStringRef kGSMagnetometerCapability;
103103
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_1
104-
CFStringRef kGSMarketingNameString;
104+
extern CFStringRef kGSMarketingNameString;
105105
#endif
106-
CFStringRef kGSMicrophoneCapability;
107-
CFStringRef kGSNikeIpodCapability;
108-
CFStringRef kGSNotGreenTeaDeviceCapability;
109-
CFStringRef kGSOpenGLES1Capability;
110-
CFStringRef kGSOpenGLES2Capability;
106+
extern CFStringRef kGSMicrophoneCapability;
107+
extern CFStringRef kGSNikeIpodCapability;
108+
extern CFStringRef kGSNotGreenTeaDeviceCapability;
109+
extern CFStringRef kGSOpenGLES1Capability;
110+
extern CFStringRef kGSOpenGLES2Capability;
111111
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_1
112-
CFStringRef kGSPeer2PeerCapability;
112+
extern CFStringRef kGSPeer2PeerCapability;
113113
#endif
114-
CFStringRef kGSPiezoClickerCapability;
115-
CFStringRef kGSPlatformStandAloneContactsCapability;
116-
CFStringRef kGSProximitySensorCapability;
117-
CFStringRef kGSRingerSwitchCapability;
118-
CFStringRef kGSSMSCapability;
119-
CFStringRef kGSScreenDimensionsCapability;
120-
CFStringRef kGSSensitiveUICapability;
121-
CFStringRef kGSTVOutSettingsCapability;
122-
CFStringRef kGSTelephonyCapability;
123-
CFStringRef kGSUnifiedIPodCapability;
124-
CFStringRef kGSVideoCameraCapability;
125-
CFStringRef kGSVoiceControlCapability;
126-
CFStringRef kGSVolumeButtonCapability;
127-
CFStringRef kGSWiFiCapability;
128-
CFStringRef kGSYouTubeCapability;
129-
CFStringRef kGSYouTubePluginCapability;
114+
extern CFStringRef kGSPiezoClickerCapability;
115+
extern CFStringRef kGSPlatformStandAloneContactsCapability;
116+
extern CFStringRef kGSProximitySensorCapability;
117+
extern CFStringRef kGSRingerSwitchCapability;
118+
extern CFStringRef kGSSMSCapability;
119+
extern CFStringRef kGSScreenDimensionsCapability;
120+
extern CFStringRef kGSSensitiveUICapability;
121+
extern CFStringRef kGSTVOutSettingsCapability;
122+
extern CFStringRef kGSTelephonyCapability;
123+
extern CFStringRef kGSUnifiedIPodCapability;
124+
extern CFStringRef kGSVideoCameraCapability;
125+
extern CFStringRef kGSVoiceControlCapability;
126+
extern CFStringRef kGSVolumeButtonCapability;
127+
extern CFStringRef kGSWiFiCapability;
128+
extern CFStringRef kGSYouTubeCapability;
129+
extern CFStringRef kGSYouTubePluginCapability;
130130
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_2
131-
CFStringRef kGS720pPlaybackCapability;
132-
CFStringRef kGSCellularDataCapability;
133-
CFStringRef kGSContainsCellularRadioCapability;
134-
CFStringRef kGSDataPlanCapability;
135-
CFStringRef kGSDisplayPortCapability;
136-
CFStringRef kGSH264EncoderCapability;
137-
CFStringRef kGSHideNonDefaultApplicationsCapability;
138-
CFStringRef kGSWildcatCapability;
131+
extern CFStringRef kGS720pPlaybackCapability;
132+
extern CFStringRef kGSCellularDataCapability;
133+
extern CFStringRef kGSContainsCellularRadioCapability;
134+
extern CFStringRef kGSDataPlanCapability;
135+
extern CFStringRef kGSDisplayPortCapability;
136+
extern CFStringRef kGSH264EncoderCapability;
137+
extern CFStringRef kGSHideNonDefaultApplicationsCapability;
138+
extern CFStringRef kGSWildcatCapability;
139139
#endif
140140
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
141-
CFStringRef kGSCameraFlashCapability;
142-
CFStringRef kGSCanRasterizeEfficientlyCapability;
143-
CFStringRef kGSFrontFacingCameraCapability;
144-
CFStringRef kGSHiDPICapability;
145-
CFStringRef kGSIOSurfaceBackedImagesCapability;
146-
CFStringRef kGSMultitaskingCapability;
147-
CFStringRef kGSVeniceCapability;
141+
extern CFStringRef kGSCameraFlashCapability;
142+
extern CFStringRef kGSCanRasterizeEfficientlyCapability;
143+
extern CFStringRef kGSFrontFacingCameraCapability;
144+
extern CFStringRef kGSHiDPICapability;
145+
extern CFStringRef kGSIOSurfaceBackedImagesCapability;
146+
extern CFStringRef kGSMultitaskingCapability;
147+
extern CFStringRef kGSVeniceCapability;
148148
#endif
149149

150150
/// Subcapabilities
151-
CFStringRef kGSMainScreenHeight;
152-
CFStringRef kGSMainScreenOrientation;
153-
CFStringRef kGSMainScreenScale;
154-
CFStringRef kGSMainScreenWidth;
151+
extern CFStringRef kGSMainScreenHeight;
152+
extern CFStringRef kGSMainScreenOrientation;
153+
extern CFStringRef kGSMainScreenScale;
154+
extern CFStringRef kGSMainScreenWidth;
155155

156-
CFStringRef kGSEnforceGoogleMail;
156+
extern CFStringRef kGSEnforceGoogleMail;
157157
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_2
158-
CFStringRef kGSEnforceCameraShutterClick;
158+
extern CFStringRef kGSEnforceCameraShutterClick;
159159
#endif
160160

161161
__END_DECLS

‎GraphicsServices/GSEvent.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ void GSEventStopVibrator(); ///< Equivalent to GSEventVibrateForDuration(0)
430430
#pragma mark -
431431
#pragma mark Hardware keyboard events
432432
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_2
433-
const char *kGSEventHardwareKeyboardAvailabilityChangedNotification; // "GSEventHardwareKeyboardAttached"
433+
extern const char *kGSEventHardwareKeyboardAvailabilityChangedNotification; // "GSEventHardwareKeyboardAttached"
434434
Boolean GSEventIsHardwareKeyboardAttached(void);
435435
void GSEventSetHardwareKeyboardAttached(Boolean attached);
436436

‎GraphicsServices/GSHiccup.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void GSSampleSelfWithThreads(int r0, int *r1, Boolean threads);
4646
void GSSampleSelf(int r0, int *r1); ///< Calls *r1 = 0; GSSampleSelfWithThreads(r0, r1, true);
4747

4848
// which is a capability.
49-
CFStringRef kGSHiccoughInterval;
49+
extern CFStringRef kGSHiccoughInterval;
5050

5151
__END_DECLS
5252

‎GraphicsServices/GSMaps.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Boolean GSMapKitAvailable();
5454
/// This value will be refreshed when the carrier changes.
5555
Boolean GSMapsVisible();
5656

57-
CFStringRef kGSMapsVisibilityChangedNotification;
57+
extern CFStringRef kGSMapsVisibilityChangedNotification;
5858

5959
__END_DECLS
6060

0 commit comments

Comments
 (0)