diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 17:25:34 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 17:25:34 +0000 |
| commit | 9a715154f7d09908b3013b0fbe9053c4bc5ee75b (patch) | |
| tree | 54567bb37834b93a676abd9e74b2303943e8893a /build | |
| parent | b590a9dae862afb7f488f6e6b7ef76c3f5b8df30 (diff) | |
| download | chromium_src-9a715154f7d09908b3013b0fbe9053c4bc5ee75b.zip chromium_src-9a715154f7d09908b3013b0fbe9053c4bc5ee75b.tar.gz chromium_src-9a715154f7d09908b3013b0fbe9053c4bc5ee75b.tar.bz2 | |
reland of intsafe precompiled header fix from https://codereview.chromium.org/14201003/
With fixed include path.
TBR=cpu@chromium.org
BUG=225822
Review URL: https://codereview.chromium.org/14096011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194620 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, 28 insertions, 18 deletions
diff --git a/build/intsafe_workaround.h b/build/intsafe_workaround.h new file mode 100644 index 0000000..8d459cb --- /dev/null +++ b/build/intsafe_workaround.h @@ -0,0 +1,27 @@ +// 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 9f82f88..ab678ca 100644 --- a/build/precompile.h +++ b/build/precompile.h @@ -107,21 +107,4 @@ #include <utility> #include <vector> -// 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 +#include "intsafe_workaround.h" |