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: http://src.chromium.org/svn/trunk/src/build@194507 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
scottmg@chromium.org 2013-04-17 01:37:20 +00:00
Родитель ec9bc6068d
Коммит 476249982b
2 изменённых файлов: 18 добавлений и 28 удалений

Просмотреть файл

@ -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_

Просмотреть файл

@ -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