*** old/src/share/vm/runtime/globals.hpp	Mon Sep 28 13:36:30 2015
--- new/src/share/vm/runtime/globals.hpp	Mon Sep 28 13:36:30 2015

*** 277,286 ****
--- 277,294 ----
      INVALID_FLAG,
      // other, unspecified error related to setting the flag
      ERR_OTHER
    };
  
+   enum MsgType {
+     NONE = 0,
+     DIAGNOSTIC_FLAG_BUT_LOCKED,
+     EXPERIMENTAL_FLAG_BUT_LOCKED,
+     DEVELOPER_FLAG_BUT_PRODUCT_BUILD,
+     NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD
+   };
+ 
    const char* _type;
    const char* _name;
    void* _addr;
    NOT_PRODUCT(const char* _doc;)
    Flags _flags;

*** 362,372 ****
--- 370,380 ----
    bool is_writeable_ext() const;
    bool is_external_ext() const;
  
    void unlock_diagnostic();
  
!   void get_locked_message(char*, int) const;
!   Flag::MsgType get_locked_message(char*, int) const;
    void get_locked_message_ext(char*, int) const;
  
    // printRanges will print out flags type, name and range values as expected by -XX:+PrintFlagsRanges
    void print_on(outputStream* st, bool withComments = false, bool printRanges = false);
    void print_kind(outputStream* st);