| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_STUBS_CONFIG_H_ | 5 #ifndef CC_STUBS_CONFIG_H_ |
| 6 #define CC_STUBS_CONFIG_H_ | 6 #define CC_STUBS_CONFIG_H_ |
| 7 | 7 |
| 8 // Chromium's LOG() macro collides with one from WTF. | 8 // Chromium's LOG() macro collides with one from WTF. |
| 9 | 9 |
| 10 #if INSIDE_WEBKIT_BUILD | 10 #if INSIDE_WEBKIT_BUILD |
| 11 #include "Source/WTF/config.h" | 11 #include "Source/WTF/config.h" |
| 12 #else | 12 #else |
| 13 #include "third_party/WebKit/Source/WTF/config.h" | 13 #include "third_party/WebKit/Source/WTF/config.h" |
| 14 #endif | 14 #endif |
| 15 |
| 16 #include <wtf/Assertions.h> |
| 15 #ifdef LOG | 17 #ifdef LOG |
| 16 #undef LOG | 18 #undef LOG |
| 17 #endif | 19 #endif |
| 18 | 20 |
| 19 #endif // CC_STUBS_CONFIG_H_ | 21 #endif // CC_STUBS_CONFIG_H_ |
| OLD | NEW |