X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnative%2Fvm%2Fjava_lang_Object.h;h=21878bccd1a46e0b862d3975c17fcb4c5a1b84d4;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=0fdb6d29f0d38d35cc47bf0a38fc1e6cc5b17f08;hpb=e1954c7dda7b19b313ee32a0ba68a68c602b5f2d;p=cacao.git

diff --git a/src/native/vm/java_lang_Object.h b/src/native/vm/java_lang_Object.h
index 0fdb6d29f..21878bccd 100644
--- a/src/native/vm/java_lang_Object.h
+++ b/src/native/vm/java_lang_Object.h
@@ -1,6 +1,6 @@
 /* src/native/vm/java_lang_Object.h - java/lang/Object functions
 
-   Copyright (C) 2006 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   Copyright (C) 2006, 2007 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
    C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
    Institut f. Computersprachen - TU Wien
@@ -22,12 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   $Id: java_lang_VMObject.c 6213 2006-12-18 17:36:06Z twisti $
-
 */
 
 
@@ -38,8 +32,20 @@
 #include "vm/types.h"
 
 #include "native/jni.h"
+
+#if defined(ENABLE_JAVASE)
+# include "native/include/java_lang_String.h"           /* required by j.l.CL */
+
+# if defined(WITH_CLASSPATH_SUN)
+#  include "native/include/java_nio_ByteBuffer.h"       /* required by j.l.CL */
+# endif
+
+# include "native/include/java_lang_ClassLoader.h"       /* required by j.l.C */
+# include "native/include/java_lang_Cloneable.h"
+#endif
+
 #include "native/include/java_lang_Class.h"
-#include "native/include/java_lang_Cloneable.h"
+
 #include "native/include/java_lang_Object.h"
 
 
@@ -51,9 +57,7 @@ void              _Jv_java_lang_Object_notifyAll(java_lang_Object *this);
 void              _Jv_java_lang_Object_wait(java_lang_Object *o, s8 ms, s4 ns);
 
 #if defined(ENABLE_JAVASE)
-
 java_lang_Object *_Jv_java_lang_Object_clone(java_lang_Cloneable *this);
-
 #endif
 
 #endif /* _JV_JAVA_LANG_OBJECT_H */