Mercurial > hg > graal-compiler
comparison src/share/vm/utilities/macros.hpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 5d0bb7d52783 db9981fd3124 |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
128 #define NOT_MANAGEMENT_RETURN {} | 128 #define NOT_MANAGEMENT_RETURN {} |
129 #define NOT_MANAGEMENT_RETURN_(code) { return code; } | 129 #define NOT_MANAGEMENT_RETURN_(code) { return code; } |
130 #endif // INCLUDE_MANAGEMENT | 130 #endif // INCLUDE_MANAGEMENT |
131 | 131 |
132 /* | 132 /* |
133 * When INCLUDE_ALTERNATE_GCS is false the only garbage collectors | 133 * When INCLUDE_ALL_GCS is false the only garbage collectors |
134 * included in the JVM are defaultNewGeneration and markCompact. | 134 * included in the JVM are defaultNewGeneration and markCompact. |
135 * | 135 * |
136 * When INCLUDE_ALTERNATE_GCS is true all garbage collectors are | 136 * When INCLUDE_ALL_GCS is true all garbage collectors are |
137 * included in the JVM. | 137 * included in the JVM. |
138 */ | 138 */ |
139 #ifndef INCLUDE_ALTERNATE_GCS | 139 #ifndef INCLUDE_ALL_GCS |
140 #define INCLUDE_ALTERNATE_GCS 1 | 140 #define INCLUDE_ALL_GCS 1 |
141 #endif // INCLUDE_ALTERNATE_GCS | 141 #endif // INCLUDE_ALL_GCS |
142 | 142 |
143 #if INCLUDE_ALTERNATE_GCS | 143 #if INCLUDE_ALL_GCS |
144 #define NOT_ALTERNATE_GCS_RETURN /* next token must be ; */ | 144 #define NOT_ALL_GCS_RETURN /* next token must be ; */ |
145 #define NOT_ALTERNATE_GCS_RETURN_(code) /* next token must be ; */ | 145 #define NOT_ALL_GCS_RETURN_(code) /* next token must be ; */ |
146 #else | 146 #else |
147 #define NOT_ALTERNATE_GCS_RETURN {} | 147 #define NOT_ALL_GCS_RETURN {} |
148 #define NOT_ALTERNATE_GCS_RETURN_(code) { return code; } | 148 #define NOT_ALL_GCS_RETURN_(code) { return code; } |
149 #endif // INCLUDE_ALTERNATE_GCS | 149 #endif // INCLUDE_ALL_GCS |
150 | 150 |
151 #ifndef INCLUDE_NMT | 151 #ifndef INCLUDE_NMT |
152 #define INCLUDE_NMT 1 | 152 #define INCLUDE_NMT 1 |
153 #endif // INCLUDE_NMT | 153 #endif // INCLUDE_NMT |
154 | 154 |