* Removed all Id tags.

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

diff --git a/src/native/vm/nativevm.h b/src/native/vm/nativevm.h
index 6fc1946cfbb65ae2f5edc7b47f2a88bcb561d821..17e49446ace136a9a660718cc739264ced6661ca 100644 (file)
--- a/src/native/vm/nativevm.h
+++ b/src/native/vm/nativevm.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: native.c 7906 2007-05-14 17:25:33Z twisti $
-
 */
 
 
@@ -33,12 +31,18 @@
 #include "config.h"
 #include "vm/types.h"
 
+#include "vm/global.h"
+
+
 /* function prototypes ********************************************************/
 
-void nativevm_init(void);
+bool nativevm_preinit(void);
+bool nativevm_init(void);
 
 #if defined(ENABLE_JAVASE)
+
 # if defined(WITH_CLASSPATH_GNU)
+
 void _Jv_gnu_classpath_VMStackWalker_init();
 void _Jv_gnu_classpath_VMSystemProperties_init();
 void _Jv_gnu_java_lang_management_VMClassLoadingMXBeanImpl_init();
@@ -59,11 +63,25 @@ void _Jv_java_lang_reflect_Field_init();
 void _Jv_java_lang_reflect_Method_init();
 void _Jv_java_lang_reflect_VMProxy_init();
 void _Jv_java_security_VMAccessController_init();
+void _Jv_java_util_concurrent_atomic_AtomicLong_init();
+void _Jv_sun_misc_Unsafe_init();
+
+#if defined(ENABLE_ANNOTATIONS)
+void _Jv_sun_reflect_ConstantPool_init();
+#endif
+
+# elif defined(WITH_CLASSPATH_SUN)
+
 void _Jv_sun_misc_Unsafe_init();
+
 # else
+
 #  error unknown classpath configuration
+
 # endif
+
 #elif defined(ENABLE_JAVAME_CLDC1_1)
+
 void _Jv_com_sun_cldc_io_ResourceInputStream_init();
 void _Jv_com_sun_cldc_io_j2me_socket_Protocol_init();
 void _Jv_com_sun_cldchi_io_ConsoleOutputStream_init();
@@ -78,8 +96,11 @@ void _Jv_java_lang_String_init();
 void _Jv_java_lang_System_init();
 void _Jv_java_lang_Thread_init();
 void _Jv_java_lang_Throwable_init();
+
 #else
+
 # error unknown Java configuration
+
 #endif
 
 #endif /* _NATIVEVM_H */