Part 1 of making sync work on Mac:

- Add high res timer class for mac (we might eventually replace all timer classes with Chrome ones)
- Define POSIX for OS==mac where needed
- Add new liens at the end of some files since otherwise they produce errors on Mac
- Rearrange initializer list of constructors to match declaration order in header; these become warning as error.
- Some chrome.gyp magic

At this point the code compiles but doesn't link due to some missing code on Mac like SSL stuff. But
I thought this was a good check point.

Note that chrome.gyp magic might change in future.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/255053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28414 0039d316-1c4b-4281-b951-d872f2087c98

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