Index: vm/gc_gen/src/jni/java_support.h =================================================================== --- vm/gc_gen/src/jni/java_support.h (revision 642365) +++ vm/gc_gen/src/jni/java_support.h (working copy) @@ -22,6 +22,8 @@ #ifndef _JAVA_SUPPORT_H_ #define _JAVA_SUPPORT_H_ +#ifdef USE_JAVA_HELPER + #include "open/types.h" #include "../common/gc_platform.h" @@ -31,6 +33,8 @@ void HelperClass_set_GenMode(Boolean status); void HelperClass_set_NosBoundary(void* boundary); +#endif + #endif /*_JAVA_SUPPORT_H_*/ Index: vm/gc_gen/src/jni/java_natives.cpp =================================================================== --- vm/gc_gen/src/jni/java_natives.cpp (revision 642365) +++ vm/gc_gen/src/jni/java_natives.cpp (working copy) @@ -14,7 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + +#ifdef USE_JAVA_HELPER #include #include #include "open/vm_util.h" @@ -122,3 +123,5 @@ #ifdef __cplusplus } #endif + +#endif Index: vm/gc_gen/src/jni/java_support.cpp =================================================================== --- vm/gc_gen/src/jni/java_support.cpp (revision 642365) +++ vm/gc_gen/src/jni/java_support.cpp (working copy) @@ -19,6 +19,8 @@ * @author Xiao-Feng Li, 2006/10/05 */ +#ifdef USE_JAVA_HELPER + #include #include #include "open/vm_field_access.h" @@ -84,3 +86,5 @@ return; } + +#endif