diff options
| author |  Mathew Huusko V <mhuusko5@gmail.com> | 2017-06-02 18:42:17 +0100 |
|---|---|---|
| committer |  Paul Beusterien <paulbeusterien@google.com> | 2017-06-02 10:42:17 -0700 |
| commit | 5c59342e6e19989c012877362af529b3d5d0abeb (patch) | |
| tree | 457f5da7c41ee45b8d3f55f83017fff2ab718781 /Firebase/Database/third_party | |
| parent | 6f700dd6c81711a8605c2587b4f2acfd4e07466b (diff) | |
macOS (#38)
* Example/Core: create macOS app/tests target
* Example/Core: Core_Example/Tests -> Core_Example/Tests_iOS
* Example/Core: macOS building/tests passing
* Example/Database: separate iOS/macOS targets
* BuildFrameworks: macOS
* .travis.yml, test.sh: AllUnitTests -> AllUnitTests_iOS
* test.sh: add AllUnitTests_macOS
* Example/Storage: Example/Tests->_iOS
* Example/Storage: macOS
* test.sh: try to prevent double error 65
* test.sh: build before test
* Example/Auth|Messaging: -> _iOS
* Example/Auth: macOS build
* Example/Auth: macOS passing
* Example/Firebase: pod de/re-integrate; fix static DerivedData references; copy phase for OCMock
* Example/Firebase: manually copied OCMock, Products Dir vs. Frameworks
* Example/Firebase: copied OCMock, prevent header removal
* Example/Storage: integration tests sdk fix
* Example/Auth: macOS exclude FIRAuthAppCredentialManager; cleanup
* Firebase/Core: remove nullability annotation
* Firebase/Core|Database: correct TARGET_X usage for correctness and anticipation of OS_WATCH|TV branches
* build.swift: style fix
* Firebase/Core: FIRLogger: fix macOS intermittent va_list error
Diffstat (limited to 'Firebase/Database/third_party')
| -rw-r--r-- | Firebase/Database/third_party/SocketRocket/FSRWebSocket.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m index c2b395c..54fcf27 100644 --- a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m +++ b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m @@ -16,7 +16,7 @@ #import "FSRWebSocket.h" -#if TARGET_OS_IPHONE +#if TARGET_OS_IOS #define HAS_ICU #endif @@ -26,9 +26,9 @@ #import <unicode/utf8.h> #endif -#if TARGET_OS_IPHONE +#if TARGET_OS_IOS #import <Endian.h> -#else +#elif TARGET_OS_OSX #import <CoreServices/CoreServices.h> #endif |