1.1 --- a/src/share/vm/utilities/macros.hpp Fri Jan 18 05:33:32 2013 -0800 1.2 +++ b/src/share/vm/utilities/macros.hpp Wed Jan 23 13:02:39 2013 -0500 1.3 @@ -130,23 +130,23 @@ 1.4 #endif // INCLUDE_MANAGEMENT 1.5 1.6 /* 1.7 - * When INCLUDE_ALTERNATE_GCS is false the only garbage collectors 1.8 + * When INCLUDE_ALL_GCS is false the only garbage collectors 1.9 * included in the JVM are defaultNewGeneration and markCompact. 1.10 * 1.11 - * When INCLUDE_ALTERNATE_GCS is true all garbage collectors are 1.12 + * When INCLUDE_ALL_GCS is true all garbage collectors are 1.13 * included in the JVM. 1.14 */ 1.15 -#ifndef INCLUDE_ALTERNATE_GCS 1.16 -#define INCLUDE_ALTERNATE_GCS 1 1.17 -#endif // INCLUDE_ALTERNATE_GCS 1.18 +#ifndef INCLUDE_ALL_GCS 1.19 +#define INCLUDE_ALL_GCS 1 1.20 +#endif // INCLUDE_ALL_GCS 1.21 1.22 -#if INCLUDE_ALTERNATE_GCS 1.23 -#define NOT_ALTERNATE_GCS_RETURN /* next token must be ; */ 1.24 -#define NOT_ALTERNATE_GCS_RETURN_(code) /* next token must be ; */ 1.25 +#if INCLUDE_ALL_GCS 1.26 +#define NOT_ALL_GCS_RETURN /* next token must be ; */ 1.27 +#define NOT_ALL_GCS_RETURN_(code) /* next token must be ; */ 1.28 #else 1.29 -#define NOT_ALTERNATE_GCS_RETURN {} 1.30 -#define NOT_ALTERNATE_GCS_RETURN_(code) { return code; } 1.31 -#endif // INCLUDE_ALTERNATE_GCS 1.32 +#define NOT_ALL_GCS_RETURN {} 1.33 +#define NOT_ALL_GCS_RETURN_(code) { return code; } 1.34 +#endif // INCLUDE_ALL_GCS 1.35 1.36 #ifndef INCLUDE_NMT 1.37 #define INCLUDE_NMT 1