diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/expat/expat.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 9 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/basictypes.h | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index e0ac29d..3224cc7 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -43,7 +43,7 @@ 'COMPILED_FROM_DSP', ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="mac"', { 'defines': [ 'HAVE_EXPAT_CONFIG_H', ], diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index c212c5e4..50cac6d 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -27,6 +27,13 @@ 'FEATURE_ENABLE_SSL', 'FEATURE_ENABLE_VOICEMAIL', ], + 'conditions': [ + ['OS=="linux" or OS=="mac"', { + 'defines': [ + 'POSIX', + ], + }], + ], }, 'conditions': [ ['OS=="win"', { @@ -34,7 +41,7 @@ '../third_party/platformsdk_win2008_6_1/files/Include', ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="mac"', { 'defines': [ 'POSIX', ], diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h index 2d21d80..3196ab3 100644 --- a/third_party/libjingle/overrides/talk/base/basictypes.h +++ b/third_party/libjingle/overrides/talk/base/basictypes.h @@ -29,9 +29,15 @@ typedef __int64 int64; #else typedef unsigned long long uint64; typedef long long int64; +#ifndef INT64_C #define INT64_C(x) x ## LL +#endif +#ifndef UINT64_C #define UINT64_C(x) x ## ULL +#endif +#ifndef INT64_F #define INT64_F "ll" +#endif #endif /* COMPILER_MSVC */ #endif // INT_TYPES_DEFINED |