windows: Remove vestigal support for /Wp64

This flag was removed from our build in 2008, so we no longer
need workarounds to support it.

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

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

3 files changed, 1 insertions, 82 deletions

diff --git a/base/atomicops.h b/base/atomicops.h
index 5b2b9dd..a087e3d 100644
--- a/base/atomicops.h
+++ b/base/atomicops.h
@@ -35,11 +35,7 @@
 namespace base {
 namespace subtle {
 
-// Bug 1308991.  We need this for /Wp64, to mark it safe for AtomicWord casting.
-#ifndef OS_WIN
-#define __w64
-#endif
-typedef __w64 int32 Atomic32;
+typedef int32 Atomic32;
 #ifdef ARCH_CPU_64_BITS
 // We need to be able to go between Atomic64 and AtomicWord implicitly.  This
 // means Atomic64 and AtomicWord should be the same type on 64-bit.
diff --git a/base/base.gypi b/base/base.gypi
index 2c789bf0..c35b344 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -94,7 +94,6 @@
           'files/file_path_watcher_linux.cc',
           'files/file_path_watcher_mac.cc',
           'files/file_path_watcher_win.cc',
-          'fix_wp64.h',
           'float_util.h',
           'global_descriptors_posix.cc',
           'global_descriptors_posix.h',
diff --git a/base/fix_wp64.h b/base/fix_wp64.h
deleted file mode 100644
index 7e2f7c1..0000000
--- a/base/fix_wp64.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// Various inline functions and macros to fix compilation of 32 bit target
-// on MSVC with /Wp64 flag enabled.
-
-#ifndef BASE_FIX_WP64_H__
-#define BASE_FIX_WP64_H__
-#pragma once
-
-#include <windows.h>
-
-// Platform SDK fixes when building with /Wp64 for a 32 bits target.
-#if !defined(_WIN64) && defined(_Wp64)
-
-#ifdef InterlockedExchangePointer
-#undef InterlockedExchangePointer
-// The problem is that the macro provided for InterlockedExchangePointer() is
-// doing a (LONG) C-style cast that triggers invariably the warning C4312 when
-// building on 32 bits.
-inline void* InterlockedExchangePointer(void* volatile* target, void* value) {
-  return reinterpret_cast<void*>(static_cast<LONG_PTR>(InterlockedExchange(
-      reinterpret_cast<volatile LONG*>(target),
-      static_cast<LONG>(reinterpret_cast<LONG_PTR>(value)))));
-}
-#endif  // #ifdef InterlockedExchangePointer
-
-#ifdef SetWindowLongPtrA
-#undef SetWindowLongPtrA
-// When build on 32 bits, SetWindowLongPtrX() is a macro that redirects to
-// SetWindowLongX(). The problem is that this function takes a LONG argument
-// instead of a LONG_PTR.
-inline LONG_PTR SetWindowLongPtrA(HWND window, int index, LONG_PTR new_long) {
-  return ::SetWindowLongA(window, index, static_cast<LONG>(new_long));
-}
-#endif  // #ifdef SetWindowLongPtrA
-
-#ifdef SetWindowLongPtrW
-#undef SetWindowLongPtrW
-inline LONG_PTR SetWindowLongPtrW(HWND window, int index, LONG_PTR new_long) {
-  return ::SetWindowLongW(window, index, static_cast<LONG>(new_long));
-}
-#endif  // #ifdef SetWindowLongPtrW
-
-#ifdef GetWindowLongPtrA
-#undef GetWindowLongPtrA
-inline LONG_PTR GetWindowLongPtrA(HWND window, int index) {
-  return ::GetWindowLongA(window, index);
-}
-#endif  // #ifdef GetWindowLongPtrA
-
-#ifdef GetWindowLongPtrW
-#undef GetWindowLongPtrW
-inline LONG_PTR GetWindowLongPtrW(HWND window, int index) {
-  return ::GetWindowLongW(window, index);
-}
-#endif  // #ifdef GetWindowLongPtrW
-
-#ifdef SetClassLongPtrA
-#undef SetClassLongPtrA
-inline LONG_PTR SetClassLongPtrA(HWND window, int index, LONG_PTR new_long) {
-  return ::SetClassLongA(window, index, static_cast<LONG>(new_long));
-}
-#endif  // #ifdef SetClassLongPtrA
-
-#ifdef SetClassLongPtrW
-#undef SetClassLongPtrW
-inline LONG_PTR SetClassLongPtrW(HWND window, int index, LONG_PTR new_long) {
-  return ::SetClassLongW(window, index, static_cast<LONG>(new_long));
-}
-#endif  // #ifdef SetClassLongPtrW
-
-#endif  // #if !defined(_WIN64) && defined(_Wp64)
-
-#endif  // BASE_FIX_WP64_H__