diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 01:37:20 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 01:37:20 +0000 |
| commit | 8e2f90cf7d4267949321a6e8f3ebd7ef675b374b (patch) | |
| tree | a4c08f24aa8abec83e4f0ddd0299c8565fcb816c /build | |
| parent | 2a0e06e1644314d8af0ce3215cde7ea2fd7c5847 (diff) | |
| download | chromium_src-8e2f90cf7d4267949321a6e8f3ebd7ef675b374b.zip chromium_src-8e2f90cf7d4267949321a6e8f3ebd7ef675b374b.tar.gz chromium_src-8e2f90cf7d4267949321a6e8f3ebd7ef675b374b.tar.bz2 | |
Revert 194506 "intsafe workaround to separate header"
Broke x64 compile.
> intsafe workaround to separate header
>
> Allows workaround to work without precompiled headers (as in
> buildtype=Official)
>
> R=cpu@chromium.org
> BUG=225822
>
> Review URL: https://codereview.chromium.org/14201003
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/13977005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/intsafe_workaround.h | 27 | ||||
| -rw-r--r-- | build/precompile.h | 19 |
2 files changed, 18 insertions, 28 deletions
diff --git a/build/intsafe_workaround.h b/build/intsafe_workaround.h deleted file mode 100644 index 8d459cb..0000000 --- a/build/intsafe_workaround.h +++ /dev/null @@ -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_ diff --git a/build/precompile.h b/build/precompile.h index 2209fec..9f82f88 100644 --- a/build/precompile.h +++ b/build/precompile.h @@ -107,4 +107,21 @@ #include <utility> #include <vector> -#include "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 |