diff options
| author |  Michael Lehenbauer <mikelehen@google.com> | 2018-01-09 12:57:21 -0800 |
|---|---|---|
| committer | Michael Lehenbauer <mikelehen@google.com> | 2018-01-09 12:57:21 -0800 |
| commit | aa00c7444982de08b21604965a708d1cad5188f7 (patch) | |
| tree | 166325a14805321cbf5045fdd4a52dd634747218 /Firebase/Database/third_party/SocketRocket/FSRWebSocket.m | |
| parent | 2c6682c66ea7b86b3b7cb52e623086b4184d500a (diff) | |
| parent | c18af34fca72b5721cab4e3b26da7469df8fcc6b (diff) | |
Merge branch 'master' into mikelehen/merge-master-to-firestore-api-changes
Diffstat (limited to 'Firebase/Database/third_party/SocketRocket/FSRWebSocket.m')
| -rw-r--r-- | Firebase/Database/third_party/SocketRocket/FSRWebSocket.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m index a2c857b..c80dbb0 100644 --- a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m +++ b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m @@ -18,7 +18,7 @@ #import "FSRWebSocket.h" -#if TARGET_OS_IOS +#if TARGET_OS_IOS || TARGET_OS_TV #define HAS_ICU #endif @@ -28,7 +28,7 @@ #import <unicode/utf8.h> #endif -#if TARGET_OS_IOS +#if TARGET_OS_IOS || TARGET_OS_TV #import <Endian.h> #elif TARGET_OS_OSX #import <CoreServices/CoreServices.h> |