[kaffe] CVS kaffe (robilad): kaffe/kaffevm/readClass.c (readClass): Accept classes generated

[Kaffe CVS]

PatchSet 7493 
Date: 2007/06/27 13:50:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-06-27  Christian Thalinger  <twisti at complang.tuwien.ac.at>

        * kaffe/kaffevm/readClass.c (readClass): Accept classes generated
        by javac 1.6.

        * kaffe/kaffevm/readClass.h (MAJOR_VERSION_V1_6, MINOR_VERSION_V1_6):
        New constants.

Members: 
	ChangeLog:1.4992->1.4993 
	kaffe/kaffevm/readClass.c:1.29->1.30 
	kaffe/kaffevm/readClass.h:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4992 kaffe/ChangeLog:1.4993
--- kaffe/ChangeLog:1.4992	Sun Jun 24 23:37:26 2007
+++ kaffe/ChangeLog	Wed Jun 27 13:50:40 2007
@@ -1,3 +1,11 @@
+2007-06-27  Christian Thalinger  <twisti at complang.tuwien.ac.at>
+
+	* kaffe/kaffevm/readClass.c (readClass): Accept classes generated 
+	by javac 1.6.
+
+	* kaffe/kaffevm/readClass.h (MAJOR_VERSION_V1_6, MINOR_VERSION_V1_6):
+	New constants.
+
 2007-06-25  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/awt-implementations/kaffe/Makefile.am,
Index: kaffe/kaffe/kaffevm/readClass.c
diff -u kaffe/kaffe/kaffevm/readClass.c:1.29 kaffe/kaffe/kaffevm/readClass.c:1.30
--- kaffe/kaffe/kaffevm/readClass.c:1.29	Wed Apr  4 15:53:02 2007
+++ kaffe/kaffe/kaffevm/readClass.c	Wed Jun 27 13:50:43 2007
@@ -63,7 +63,8 @@
 	       (major_version == MAJOR_VERSION_V1_2 && minor_version == MINOR_VERSION_V1_2) ||
 	       (major_version == MAJOR_VERSION_V1_3 && minor_version == MINOR_VERSION_V1_3) ||
 	       (major_version == MAJOR_VERSION_V1_4 && minor_version == MINOR_VERSION_V1_4) ||
-	       (major_version == MAJOR_VERSION_V1_5 && minor_version == MINOR_VERSION_V1_5))) {
+	       (major_version == MAJOR_VERSION_V1_5 && minor_version == MINOR_VERSION_V1_5) ||
+	       (major_version == MAJOR_VERSION_V1_6 && minor_version == MINOR_VERSION_V1_6))) {
 		postExceptionMessage(einfo,
 				     JAVA_LANG(UnsupportedClassVersionError),
 				     "%d.%d",
Index: kaffe/kaffe/kaffevm/readClass.h
diff -u kaffe/kaffe/kaffevm/readClass.h:1.8 kaffe/kaffe/kaffevm/readClass.h:1.9
--- kaffe/kaffe/kaffevm/readClass.h:1.8	Thu Mar 30 17:39:16 2006
+++ kaffe/kaffe/kaffevm/readClass.h	Wed Jun 27 13:50:45 2007
@@ -31,7 +31,9 @@
 #define	MINOR_VERSION_V1_4	0
 #define MAJOR_VERSION_V1_5	49
 #define MINOR_VERSION_V1_5	0
-
+#define MAJOR_VERSION_V1_6      50
+#define MINOR_VERSION_V1_6      0
+ 
 typedef enum ReadAttrType {
 	READATTR_METHOD = 11,
 	READATTR_CLASS  = 12,