| Index: runtime/vm/flags.h | 
| diff --git a/runtime/vm/flags.h b/runtime/vm/flags.h | 
| index 2d882d00519b6ba650f9558316645845c4314919..f5cb8f3ff190aacf6f13a073337f80cf0fff9d86 100644 | 
| --- a/runtime/vm/flags.h | 
| +++ b/runtime/vm/flags.h | 
| @@ -11,14 +11,11 @@ | 
|  | 
| typedef const char* charp; | 
|  | 
| -#define DECLARE_FLAG(type, name)                                               \ | 
| -  extern type FLAG_##name | 
| +#define DECLARE_FLAG(type, name) extern type FLAG_##name | 
|  | 
| #define DEFINE_FLAG(type, name, default_value, comment)                        \ | 
| -  type FLAG_##name = Flags::Register_##type(&FLAG_##name,                      \ | 
| -                                            #name,                             \ | 
| -                                            default_value,                     \ | 
| -                                            comment); | 
| +  type FLAG_##name =                                                           \ | 
| +      Flags::Register_##type(&FLAG_##name, #name, default_value, comment); | 
|  | 
| #define DEFINE_FLAG_HANDLER(handler, name, comment)                            \ | 
| bool DUMMY_##name = Flags::Register_func(handler, #name, comment); | 
| @@ -71,9 +68,7 @@ class Flags { | 
| static void PrintJSON(JSONStream* js); | 
| #endif  // !PRODUCT | 
|  | 
| -  static bool SetFlag(const char* name, | 
| -                      const char* value, | 
| -                      const char** error); | 
| +  static bool SetFlag(const char* name, const char* value, const char** error); | 
|  | 
| private: | 
| static Flag** flags_; | 
| @@ -103,7 +98,7 @@ class Flags { | 
| DISALLOW_IMPLICIT_CONSTRUCTORS(Flags); | 
| }; | 
|  | 
| -#define PRODUCT_FLAG_MARCO(name, type, default_value, comment) \ | 
| +#define PRODUCT_FLAG_MARCO(name, type, default_value, comment)                 \ | 
| extern type FLAG_##name; | 
|  | 
| #if defined(DEBUG) | 
|  |