diff options
| -rw-r--r-- | build/intsafe_workaround.h | 27 | ||||
| -rw-r--r-- | build/precompile.h | 19 | ||||
| -rw-r--r-- | win8/delegate_execute/delegate_execute.cc | 2 |
3 files changed, 18 insertions, 30 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 diff --git a/win8/delegate_execute/delegate_execute.cc b/win8/delegate_execute/delegate_execute.cc index 485cf25..770b8e8 100644 --- a/win8/delegate_execute/delegate_execute.cc +++ b/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> |