diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 04:00:53 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 04:00:53 +0000 |
| commit | b15d6d12de85cea250c2e05c75caef2f70e0da75 (patch) | |
| tree | 21c8a3e6e0f468b480cb57d07ab6abf4f6f029d9 /base/system_monitor | |
| parent | db7a6f3162fe59a320f3c007fc707f32c1645b8a (diff) | |
| download | chromium_src-b15d6d12de85cea250c2e05c75caef2f70e0da75.zip chromium_src-b15d6d12de85cea250c2e05c75caef2f70e0da75.tar.gz chromium_src-b15d6d12de85cea250c2e05c75caef2f70e0da75.tar.bz2 | |
Mac64 build fix.
reinterpret_cast from void* to int causes compile error in 64bit environment.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/9494009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/system_monitor')
| -rw-r--r-- | base/system_monitor/system_monitor_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/system_monitor/system_monitor_mac.mm b/base/system_monitor/system_monitor_mac.mm index baaadf0..d0dbaab 100644 --- a/base/system_monitor/system_monitor_mac.mm +++ b/base/system_monitor/system_monitor_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,7 +28,7 @@ void SystemPowerEventCallback(void*, case kIOMessageSystemWillSleep: sys_monitor->ProcessPowerMessage(SystemMonitor::SUSPEND_EVENT); IOAllowPowerChange(g_system_power_io_port, - reinterpret_cast<int>(message_argument)); + reinterpret_cast<intptr_t>(message_argument)); break; case kIOMessageSystemWillPowerOn: |