* m4/classpath.m4: Renamed --with-classpath* options to

[cacao.git] / src / native / vm / reflect.h

diff --git a/src/native/vm/reflect.h b/src/native/vm/reflect.h
index f8e1103981ed453849e4bc3938eb11ec198450fa..6c6b45182425741dec3466f95dda6e5effcc01f8 100644 (file)
--- a/src/native/vm/reflect.h
+++ b/src/native/vm/reflect.h
@@ -23,6 +23,9 @@
 */
 
 
+#ifndef _REFLECT_H
+#define _REFLECT_H
+
 #include "config.h"
 
 #include <stdint.h>
@@ -35,7 +38,7 @@
 #include "native/include/java_lang_String.h"
 
 #if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
 #  include "native/include/java_nio_ByteBuffer.h"       /* required by j.l.CL */
 # endif
 # include "native/include/java_lang_ClassLoader.h"
@@ -62,7 +65,7 @@ java_lang_reflect_Method      *reflect_method_new(methodinfo *m);
 java_handle_t                 *reflect_constructor_newinstance(methodinfo *m, java_handle_objectarray_t *args, bool override);
 java_handle_t                 *reflect_method_invoke(methodinfo *m, java_handle_t *o, java_handle_objectarray_t *args, bool override);
 
-#if defined(WITH_CLASSPATH_GNU) && defined(ENABLE_ANNOTATIONS)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) && defined(ENABLE_ANNOTATIONS)
 struct java_util_Map* reflect_get_declaredannotatios(
        java_handle_bytearray_t *annotations,
        java_lang_Class         *declaringClass,
@@ -75,6 +78,9 @@ java_handle_objectarray_t* reflect_get_parameterannotations(
        classinfo       *referer);
 #endif
 
+#endif /* _REFLECT_H */
+
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where