--- old/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp	2015-06-25 16:48:32.000000000 -0500
+++ new/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp	2015-06-25 16:48:32.000000000 -0500
@@ -97,11 +97,12 @@
 // 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) { \
+#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);