From 1bf95290f4bcf23f284f82d28cf6db7dd4675a62 Mon Sep 17 00:00:00 2001 From: "andersca@apple.com" Date: Fri, 23 Sep 2011 19:17:15 +0000 Subject: [PATCH] Make sure to define OVERRIDE and FINAL for older builds of clang. * wtf/Compiler.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95844 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/JavaScriptCore/ChangeLog | 6 ++++++ Source/JavaScriptCore/wtf/Compiler.h | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index c325776..83089d7 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,9 @@ +2011-09-23 Anders Carlsson + + Make sure to define OVERRIDE and FINAL for older builds of clang. + + * wtf/Compiler.h: + 2011-09-23 Gavin Barraclough Implement op_resolve_global in the DFG JIT diff --git a/Source/JavaScriptCore/wtf/Compiler.h b/Source/JavaScriptCore/wtf/Compiler.h index 0fa162d..9ee8a62 100644 --- a/Source/JavaScriptCore/wtf/Compiler.h +++ b/Source/JavaScriptCore/wtf/Compiler.h @@ -203,11 +203,13 @@ #endif #elif COMPILER(MSVC) #define OVERRIDE override -#else -#define OVERRIDE #endif #endif +#ifndef OVERRIDE +#define OVERRIDE +#endif + /* FINAL */ #ifndef FINAL @@ -217,9 +219,11 @@ #endif #elif COMPILER(MSVC) #define FINAL sealed -#else -#define FINAL #endif #endif +#ifndef FINAL +#define FINAL +#endif + #endif /* WTF_Compiler_h */ -- 2.7.4