summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/notifier/base
diff options
context:
space:
mode:
authormunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 18:20:37 +0000
committermunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 18:20:37 +0000
commit01f42660659e45edd7c0a4ad8ecd7a6bb00e370e (patch)
tree3f41d81dce4744debf35d70898d24cbfa19dbbca /chrome/browser/sync/notifier/base
parentc9d9b528c1b181f9b4bcf82947b10327b4759b2d (diff)
downloadchromium_src-01f42660659e45edd7c0a4ad8ecd7a6bb00e370e.zip
chromium_src-01f42660659e45edd7c0a4ad8ecd7a6bb00e370e.tar.gz
chromium_src-01f42660659e45edd7c0a4ad8ecd7a6bb00e370e.tar.bz2
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
Diffstat (limited to 'chrome/browser/sync/notifier/base')
-rw-r--r--chrome/browser/sync/notifier/base/nethelpers.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/notifier/base/nethelpers.cc b/chrome/browser/sync/notifier/base/nethelpers.cc
index 23fc8d2..e342479 100644
--- a/chrome/browser/sync/notifier/base/nethelpers.cc
+++ b/chrome/browser/sync/notifier/base/nethelpers.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "build/build_config.h"
#include "chrome/browser/sync/notifier/base/nethelpers.h"
namespace notifier {
@@ -17,7 +18,7 @@ hostent* SafeGetHostByName(const char* hostname, hostent* host,
}
#elif OS_LINUX
gethostbyname_r(hostname, host, buffer, buffer_len, &result, herrno);
-#elif OSX
+#elif OS_MACOSX
result = getipnodebyname(hostname, AF_INET, AI_DEFAULT, herrno);
#else
#error "I don't know how to do gethostbyname safely on your system."
@@ -32,7 +33,7 @@ void FreeHostEnt(hostent* host) {
// No need to free anything, struct returned is static memory.
#elif OS_LINUX
// No need to free anything, we pass in a pointer to a struct.
-#elif OSX
+#elif OS_MACOSX
freehostent(host);
#else
#error "I don't know how to free a hostent on your system."