[kaffe] CVS kaffe (robilad): cleaned up include/system.h

[Kaffe CVS]

PatchSet 7251 
Date: 2006/04/19 23:07:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up include/system.h

2006-04-20  Dalibor Topic  <robilad at kaffe.org>

* kaffe/kaffe/main.c (KAFFEHOME): Removed duplicate definition.

* kaffe/kaffevm/external.c: Only include system.h once.

* include/system.h (kaffe_version, kaffe_vm_vendor, kaffe_vendor)
(kaffe_vendor_url_bug, kaffe_vendor_url)
(kaffe_vm_specification_version, kaffe_vm_specification_vendor)
(kaffe_vm_specification_name, kaffe_vm_version, kaffe_vm_name)
(kaffe_specification_version, kaffe_specification_vendor)
(kaffe_specification_name, kaffe_class_version)
(KAFFECLASSPATH): Removed unused defines.

Members: 
	ChangeLog:1.4756->1.4757 
	include/system.h:1.13->1.14 
	kaffe/kaffe/main.c:1.99->1.100 
	kaffe/kaffevm/external.c:1.85->1.86 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4756 kaffe/ChangeLog:1.4757
--- kaffe/ChangeLog:1.4756	Wed Apr 19 09:49:25 2006
+++ kaffe/ChangeLog	Wed Apr 19 23:07:40 2006
@@ -1,3 +1,17 @@
+2006-04-20  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/kaffe/main.c (KAFFEHOME): Removed duplicate definition.
+
+	* kaffe/kaffevm/external.c: Only include system.h once.
+
+	* include/system.h (kaffe_version, kaffe_vm_vendor, kaffe_vendor) 
+	(kaffe_vendor_url_bug, kaffe_vendor_url) 
+	(kaffe_vm_specification_version, kaffe_vm_specification_vendor) 
+	(kaffe_vm_specification_name, kaffe_vm_version, kaffe_vm_name) 
+	(kaffe_specification_version, kaffe_specification_vendor) 
+	(kaffe_specification_name, kaffe_class_version) 
+	(KAFFECLASSPATH): Removed unused defines.
+
 2006-04-19  Riccardo Mottola <riccardo at kaffe.org>
 	* libraries/javalib/awt-implementations/kaffe/java/awt/Container.java,
 	libraries/javalib/awt-implementations/kaffe/java/awt/Frame.java,
Index: kaffe/include/system.h
diff -u kaffe/include/system.h:1.13 kaffe/include/system.h:1.14
--- kaffe/include/system.h:1.13	Thu Jan 15 02:29:28 2004
+++ kaffe/include/system.h	Wed Apr 19 23:07:43 2006
@@ -5,6 +5,9 @@
  * Copyright (c) 1996, 1997, 1998, 1999
  *	Transvirtual Technologies, Inc.  All rights reserved.
  *
+ * Copyright (c) 2006
+ *      Kaffe.org contributors. See ChangeLog for details.
+ *
  * See the file "license.terms" for information on usage and redistribution
  * of this file.
  */
@@ -12,22 +15,6 @@
 #ifndef __system_h
 #define __system_h
 
-#define	kaffe_version			"1.2"
-#define	kaffe_vendor			"Kaffe.org project"
-#define	kaffe_vendor_url		"http://www.kaffe.org"
-#define	kaffe_vendor_url_bug		"http://www.kaffe.org"
-
-#define	kaffe_vm_specification_version	"1.0"
-#define	kaffe_vm_specification_vendor	"Sun Microsystems Inc."
-#define	kaffe_vm_specification_name	"Java Virtual Machine Specification"
-#define	kaffe_vm_version		PACKAGE_VERSION
-#define	kaffe_vm_vendor			kaffe_vendor
-#define	kaffe_vm_name			"Kaffe"
-#define	kaffe_specification_version	"1.2"
-#define	kaffe_specification_vendor	"Sun Microsystems Inc."
-#define	kaffe_specification_name	"Java Platform API Specification"
-#define	kaffe_class_version		"46.0"
-
 #if defined(unix) || defined(__unix__) || defined(__BEOS__) || defined(_AIX) || defined(__NetBSD__) || defined(__APPLE__)
 #define	file_separator		"/"
 #define	path_separator		":"
@@ -49,6 +36,5 @@
 #endif
 
 #define	KAFFEHOME		"KAFFEHOME"
-#define	KAFFECLASSPATH		"CLASSPATH"
 
 #endif
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.99 kaffe/kaffe/kaffe/main.c:1.100
--- kaffe/kaffe/kaffe/main.c:1.99	Tue Mar 28 23:38:14 2006
+++ kaffe/kaffe/kaffe/main.c	Wed Apr 19 23:07:44 2006
@@ -5,6 +5,9 @@
  * Copyright (c) 1996-2000
  *	Transvirtual Technologies, Inc.  All rights reserved.
  *
+ * Copyright (c) 2006
+ *      Kaffe.org contributors. See ChangeLog for details.
+ *
  * Cross-language profiling changes contributed by
  * the Flux Research Group, Department of Computer Science,
  * University of Utah, http://www.cs.utah.edu/flux/
@@ -69,7 +72,6 @@
 static int checkException(JNIEnv* env);
 static int main2(JNIEnv* env, char *argv[], int farg, int argc);
 
-#define	KAFFEHOME	"KAFFEHOME"
 #define	CLASSPATH1	"KAFFECLASSPATH"
 #define	LIBRARYPATH1	"KAFFELIBRARYPATH"
 
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.85 kaffe/kaffe/kaffevm/external.c:1.86
--- kaffe/kaffe/kaffevm/external.c:1.85	Thu Mar 30 17:39:16 2006
+++ kaffe/kaffe/kaffevm/external.c	Wed Apr 19 23:07:44 2006
@@ -34,7 +34,6 @@
 #include "errors.h"
 #include "exception.h"
 #include "slib.h"
-#include "system.h"
 #include "support.h"
 #include "md.h"
 #include "system.h"