chromium/src
0
Fork 0
Code Activity

Remove intsafe_workaround.h

Browse Source 
It's no longer needed.

BUG=308740
R=scottmg@chromium.org
TBR=cpu

Review URL: https://codereview.chromium.org/404443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284256 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
thakis@chromium.org
2014-07-18 23:56:37 +00:00
parent 2a103aed3c
commit 5895b2023a
6 changed files with 0 additions and 44 deletions

27
build/intsafe_workaround.h

@ -1,27 +0,0 @@
// Copyright 2013 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.
#ifndef BUILD_INTSAFE_WORKAROUND_H_
#define BUILD_INTSAFE_WORKAROUND_H_
// Workaround for:
// http://connect.microsoft.com/VisualStudio/feedback/details/621653/
// http://crbug.com/225822
// Note that we can't actually include <stdint.h> here because there's other
// code in third_party that has partial versions of stdint types that conflict.
#include <intsafe.h>
#undef INT8_MIN
#undef INT16_MIN
#undef INT32_MIN
#undef INT64_MIN
#undef INT8_MAX
#undef UINT8_MAX
#undef INT16_MAX
#undef UINT16_MAX
#undef INT32_MAX
#undef UINT32_MAX
#undef INT64_MAX
#undef UINT64_MAX
#endif // BUILD_INTSAFE_WORKAROUND_H_

2
build/precompile.h

@ -106,5 +106,3 @@
#include <string>
#include <utility>
#include <vector>
#include "intsafe_workaround.h"

1
sdch/BUILD.gn

@ -65,7 +65,6 @@ static_library("sdch") {
logging_file = rebase_path("logging_forward.h", root_build_dir)
if (is_win) {
cflags = [
"/FI", rebase_path("//build/intsafe_workaround.h", root_build_dir),
"/FI", logging_file,
]
} else {

4
sdch/sdch.gyp

@ -83,13 +83,9 @@
# ForcedIncludeFiles is relative to include_dirs, cflags relative to the
# build directory.
'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' },
'msvs_system_include_dirs': [
'<(DEPTH)/build',
],
'msvs_settings': {
'VCCLCompilerTool': {
'ForcedIncludeFiles': [
'intsafe_workaround.h', # http://crbug.com/308740
'sdch/<(logging_path)',
]
}

2
win8/delegate_execute/delegate_execute.cc

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "build/intsafe_workaround.h"
#include <atlbase.h>
#include <atlcom.h>
#include <atlctl.h>

8
win8/metro_driver/metro_driver.gyp

@ -12,11 +12,6 @@
'../../build/win_precompile.gypi',
],
'target_defaults': {
# This and the force include below is a workaround for intsafe.h in
# VS 2010.
'msvs_system_include_dirs': [
'<(DEPTH)/build',
],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
@ -30,9 +25,6 @@
'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL',
],
},
'VCCLCompilerTool': {
'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
},
},
},
'targets': [