Title: [221564] trunk/Source/WebCore/PAL
- Revision
- 221564
- Author
- [email protected]
- Date
- 2017-09-03 19:12:49 -0700 (Sun, 03 Sep 2017)
Log Message
[Cocoa] Remove use of __has_include in CoreAudioSPI.h
https://bugs.webkit.org/show_bug.cgi?id=176320
Reviewed by Tim Horton.
* pal/spi/cf/CoreAudioSPI.h: AudioHardwarePriv.h is available in all Apple internal SDKs and
only in Apple internal SDKs. AudioHardwareBase.h is available only in the macOS SDK, where
it is included by AudioHardware.h.
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (221563 => 221564)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-09-04 01:40:05 UTC (rev 221563)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-09-04 02:12:49 UTC (rev 221564)
@@ -1,3 +1,14 @@
+2017-09-03 Dan Bernstein <[email protected]>
+
+ [Cocoa] Remove use of __has_include in CoreAudioSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=176320
+
+ Reviewed by Tim Horton.
+
+ * pal/spi/cf/CoreAudioSPI.h: AudioHardwarePriv.h is available in all Apple internal SDKs and
+ only in Apple internal SDKs. AudioHardwareBase.h is available only in the macOS SDK, where
+ it is included by AudioHardware.h.
+
2017-09-03 Tim Horton <[email protected]>
Fix some style issues in the Remote Layer Tree code
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h (221563 => 221564)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h 2017-09-04 01:40:05 UTC (rev 221563)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h 2017-09-04 02:12:49 UTC (rev 221564)
@@ -27,12 +27,12 @@
#if PLATFORM(COCOA)
-#if __has_include(<CoreAudio/AudioHardwarePriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <CoreAudio/AudioHardwarePriv.h>
#else
-#if __has_include(<CoreAudio/AudioHardwareBase.h>)
-#include <CoreAudio/AudioHardwareBase.h>
+#if PLATFORM(MAC)
+#include <CoreAudio/AudioHardware.h>
#else
WTF_EXTERN_C_BEGIN
@@ -71,8 +71,10 @@
WTF_EXTERN_C_END
-#endif // __has_include(<CoreAudio/AudioHardwareBase.h>)
+#endif
+#endif
+
WTF_EXTERN_C_BEGIN
extern OSStatus AudioDeviceDuck(AudioDeviceID inDevice, Float32 inDuckedLevel, const AudioTimeStamp* __nullable inStartTime, Float32 inRampDuration);
@@ -79,6 +81,4 @@
WTF_EXTERN_C_END
-#endif // __has_include(<CoreAudio/AudioHardwarePriv.h>)
-
#endif // PLATFORM(COCOA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
