*** old/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp	Thu Jun 25 16:48:32 2015
--- new/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp	Thu Jun 25 16:48:32 2015

*** 95,109 ****
--- 95,110 ----
  }
  
  // GC workaround for "-XX:+UseConcMarkSweepGC"
  // which sets InitialTenuringThreshold to 7 but leaves MaxTenuringThreshold remaining at 6
  // and therefore would invalidate the constraint
- #define UseConcMarkSweepGCWorkaroundIfNeeded(initial, max) { \
+ do { \
    if ((initial == 7) && (max == 6)) { \
      return Flag::SUCCESS; \
    } \
  }
+ } while (0)
  
  Flag::Error InitialTenuringThresholdConstraintFunc(bool verbose, uintx* value) {
    UseConcMarkSweepGCWorkaroundIfNeeded(*value, MaxTenuringThreshold);
  
    if ((CommandLineFlags::finishedInitializing()) && (*value > MaxTenuringThreshold)) {