* src/vm/vm.c (vm_create) [ENABLE_JAVASE]: Removed #ifdef for setting

sun.boot.class.path and java.boot.class.path.
* src/vmcore/suck.c (suck_add_from_property): Likewise.

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 8978290f103e6641038c5d1868730d7cd00f67e4..82c0af269e9aded6b2c40952a466bffe4fa60374 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: vm.c 8403 2007-08-22 19:59:32Z twisti $
+   $Id: vm.c 8404 2007-08-22 21:34:24Z twisti $
 
 */
 
@@ -906,10 +906,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
 
                        strcpy(p, opt_arg);
 
-#if defined(ENABLE_JAVASE)
                        properties_add("sun.boot.class.path", p);
                        properties_add("java.boot.class.path", p);
-#endif
 
                        MFREE(boot_class_path, char, strlen(boot_class_path));
                        break;
@@ -930,10 +928,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        strcat(p, ":");
                        strcat(p, opt_arg);
 
-#if defined(ENABLE_JAVASE)
                        properties_add("sun.boot.class.path", p);
                        properties_add("java.boot.class.path", p);
-#endif
                        break;
 
                case OPT_BOOTCLASSPATH_P:
@@ -949,10 +945,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        strcat(p, ":");
                        strcat(p, boot_class_path);
 
-#if defined(ENABLE_JAVASE)
                        properties_add("sun.boot.class.path", p);
                        properties_add("java.boot.class.path", p);
-#endif
 
                        MFREE(boot_class_path, char, len);
                        break;
@@ -975,10 +969,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        strcat(p, ":");
                        strcat(p, opt_arg);
 
-#if defined(ENABLE_JAVASE)
                        properties_add("sun.boot.class.path", p);
                        properties_add("java.boot.class.path", p);
-#endif
 
                        MFREE(boot_class_path, char, strlen(boot_class_path));
                        break;

diff --git a/src/vmcore/suck.c b/src/vmcore/suck.c
index a8a8400a366f9932f30908316d7fddc6ec3181da..2d0c3a30c46e927db828e6d6fd7a855d64836567 100644 (file)
--- a/src/vmcore/suck.c
+++ b/src/vmcore/suck.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: suck.c 8403 2007-08-22 19:59:32Z twisti $
+   $Id: suck.c 8404 2007-08-22 21:34:24Z twisti $
 
 */
 
@@ -312,10 +312,8 @@ void suck_add_from_property(char *key)
                                        strcat(p, ":");
                                        strcat(p, boot_class_path);
 
-#if defined(ENABLE_JAVASE)
                                        properties_add("sun.boot.class.path", p);
                                        properties_add("java.boot.class.path", p);
-#endif
 
                                        MFREE(boot_class_path, char, strlen(boot_class_path));