Chromium Code Reviews| Index: runtime/platform/globals.h |
| diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h |
| index 40c4b07a47aef7d4047ecf750e2cac4265bc543e..f58c0d11040d0dee653d430461d85e40969e2173 100644 |
| --- a/runtime/platform/globals.h |
| +++ b/runtime/platform/globals.h |
| @@ -2,8 +2,8 @@ |
| // for details. All rights reserved. Use of this source code is governed by a |
| // BSD-style license that can be found in the LICENSE file. |
| -#ifndef PLATFORM_GLOBALS_H_ |
| -#define PLATFORM_GLOBALS_H_ |
| +#ifndef RUNTIME_PLATFORM_GLOBALS_H_ |
| +#define RUNTIME_PLATFORM_GLOBALS_H_ |
| // __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to |
| // enable platform independent printf format specifiers. |
| @@ -136,6 +136,10 @@ |
| #endif // defined(PRODUCT) |
| +#if defined(DART_PRECOMPILED_RUNTIME) && defined(DART_PRECOMPILER) |
| +#error DART_PRECOMPILED_RUNTIME and DART_PRECOMPILER are mutally exclusive |
|
rmacnak
2016/04/22 02:48:54
mutually
Cutch
2016/04/22 14:05:15
Done.
|
| +#endif // defined(DART_PRECOMPILED_RUNTIME) && defined(DART_PRECOMPILER) |
| + |
| namespace dart { |
| struct simd128_value_t { |
| @@ -674,4 +678,4 @@ static inline T ReadUnaligned(const T* ptr) { |
| } // namespace dart |
| -#endif // PLATFORM_GLOBALS_H_ |
| +#endif // RUNTIME_PLATFORM_GLOBALS_H_ |