comparison src/share/vm/utilities/macros.hpp @ 14392:b5c8a61d7fa0

Merge
author kvn
date Fri, 21 Jun 2013 15:56:24 -0700
parents 0f03ff49c720 f2110083203d
children 75ef1a499665
comparison
equal deleted inserted replaced
14391:d2907f74462e 14392:b5c8a61d7fa0
157 #define NOT_NMT_RETURN_(code) /* next token must be ; */ 157 #define NOT_NMT_RETURN_(code) /* next token must be ; */
158 #else 158 #else
159 #define NOT_NMT_RETURN {} 159 #define NOT_NMT_RETURN {}
160 #define NOT_NMT_RETURN_(code) { return code; } 160 #define NOT_NMT_RETURN_(code) { return code; }
161 #endif // INCLUDE_NMT 161 #endif // INCLUDE_NMT
162
163 #ifndef INCLUDE_TRACE
164 #define INCLUDE_TRACE 1
165 #endif // INCLUDE_TRACE
162 166
163 // COMPILER1 variant 167 // COMPILER1 variant
164 #ifdef COMPILER1 168 #ifdef COMPILER1
165 #ifdef COMPILER2 169 #ifdef COMPILER2
166 #define TIERED 170 #define TIERED