missed a header.c change related to arrayarray

diff --git a/Makefile.am b/Makefile.am
index aa988691a79595fac0ecc8b15315d0d3a536df5b..6d69aec0b381594872e43f060ce37f92ce22f643 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 664 2003-11-21 18:24:01Z jowenn $
+# $Id: Makefile.am 667 2003-11-21 19:05:06Z jowenn $
 
 @SET_MAKE@
 
@@ -89,6 +89,7 @@ cacaoh_DEPENDENCIES = \
 
 nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
        CLASSPATH=./classpathbin/@ARCH_DIR@/lib ./cacaoh \
+       java.lang.String \
        java.lang.Class \
        java.io.FileDescriptor \
        gnu.java.nio.SelectorImpl \
@@ -173,7 +174,6 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef
        java.util.Properties \
        java.lang.Runtime \
        java.lang.Throwable \
-       java.lang.String \
        gnu.java.security.x509.X509Certificate  \
        java.lang.JOWENNTest1 \
        @AWTPEERS@

diff --git a/headers.c b/headers.c
index c78c767aec7a24afb786dfaef0c8eec690710e2a..59bb4eeb50e0768dd5891277f63e429cdb3221a3 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -29,7 +29,7 @@
    Changes: Mark Probst
             Philipp Tomsich
 
-   $Id: headers.c 664 2003-11-21 18:24:01Z jowenn $
+   $Id: headers.c 667 2003-11-21 19:05:06Z jowenn $
 
 */
 
@@ -198,7 +198,7 @@ static char *printtype (char *utf_ptr)
                case 'F':  fprintf (file, "java_floatarray*"); break;
                case 'D':  fprintf (file, "java_doublearray*"); break;
                                
-               case '[':  fprintf (file, "java_arrayarray*");                                         
+               case '[':  fprintf (file, "java_objectarray*");                                        
                        while ((c = utf_nextu2(&utf_ptr)) == '[') ;
                        if (c=='L') 
                                while (utf_nextu2(&utf_ptr) != ';');

diff --git a/nat/Makefile b/nat/Makefile
index 61dcc183b2976e8dfa4811f43acad2af8a465d1e..a3ee4b96d7623acc33e8de9e15f499c516c0c03d 100644 (file)
--- a/nat/Makefile
+++ b/nat/Makefile
@@ -38,10 +38,10 @@ pkglibdir = $(libdir)/cacao
 pkgincludedir = $(includedir)/cacao
 top_builddir = ..
 
-ACLOCAL = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev201103/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev201103/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev201103/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev201103/missing --run autoheader
+ACLOCAL = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev/missing --run autoheader
 
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /bin/install -c
@@ -65,20 +65,19 @@ host_triplet = i686-pc-linux-gnu
 EXEEXT = 
 OBJEXT = o
 PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev201103/missing --run tar
-ASMPART = asmpart.S
+AMTAR = ${SHELL} /home/jowenn/development/uni/cacao/cacaodev/missing --run tar
+ARCH_DIR = i386
 AWK = gawk
 AWTPEERS = java.awt.peer.ComponentPeer                 java.awt.peer.MenuPeer          java.awt.peer.MenuItemPeer              gnu.java.awt.peer.gtk.GdkPixbufDecoder          gnu.java.awt.peer.gtk.GtkMenuBarPeer            gnu.java.awt.peer.gtk.GtkScrollPanePeer                 gnu.java.awt.peer.gtk.GtkMenuPeer               gnu.java.awt.peer.gtk.GtkTextComponentPeer              gnu.java.awt.peer.gtk.GtkComponentPeer          gnu.java.awt.peer.gtk.GtkPopupMenuPeer          gnu.java.awt.peer.gtk.GtkCheckboxGroupPeer              gnu.java.awt.peer.gtk.GtkMenuItemPeer           gnu.java.awt.peer.gtk.GdkGraphics               gnu.java.awt.peer.gtk.GtkToolkit                gnu.java.awt.peer.gtk.GtkCanvasPeer             gnu.java.awt.peer.gtk.GtkFramePeer              gnu.java.awt.peer.gtk.GdkFontMetrics            gnu.java.awt.peer.gtk.GtkScrollbarPeer          gnu.java.awt.peer.gtk.GtkGenericPeer            gnu.java.awt.peer.gtk.GtkListPeer               gnu.java.awt.peer.gtk.GtkLabelPeer              gnu.java.awt.peer.gtk.GtkTextAreaPeer           gnu.java.awt.peer.gtk.GtkCheckboxPeer           gnu.java.awt.peer.gtk.GtkFileDialogPeer                 gnu.java.awt.peer.gtk.GtkImagePainter           gnu.java.awt.peer.gtk.GtkChoicePeer             gnu.java.awt.peer.gtk.GtkPanelPeer              gnu.java.awt.peer.gtk.GtkMainThread             gnu.java.awt.peer.gtk.GtkButtonPeer             gnu.java.awt.peer.gtk.GtkTextFieldPeer          gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer           gnu.java.awt.peer.gtk.GtkClipboard              gnu.java.awt.peer.gtk.GtkWindowPeer
 AWT_OBJS = classpathbin/i386/native/jni/gtk-peer/.libs/libgtkpeer.a                    -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0                       -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0                    -lgthread-2.0 -lart_lgpl_2
 CC = gcc
-COMPILER_OBJECTS = i386/libdisass.a
+COMPILER_OBJECTS = 
 DEPDIR = .deps
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 LIBTHREAD = libthreads.a
 PACKAGE = cacao
 RANLIB = ranlib
 STRIP = 
-SYSDEP_DIR = i386
 THREAD_OBJ = threads/libthreads.a
 USEGTK = yes
 VERSION = 0.40
@@ -86,7 +85,7 @@ ZIP_C = unzip.c
 ZIP_LIBS = -lz
 am__include = include
 am__quote = 
-install_sh = /home/jowenn/development/uni/cacao/cacaodev201103/install-sh
+install_sh = /home/jowenn/development/uni/cacao/cacaodev/install-sh
 EXTRA_DIST = AccessController.c Adler32.c Array.c BigInteger.c CRC32.c Class.c ClassLoader.c ClassLoader_NativeLibrary.c Compiler.c Constructor.c DatagramPacket.c Deflater.c Double.c Field.c FileDescriptor.c FileInputStream.c FileOutputStream.c FileSystem.c Finalizer.c Float.c InetAddress.c InetAddressImpl.c Inflater.c JarFile.c Math.c Method.c Object.c ObjectInputStream.c ObjectStreamClass.c Package.c PlainDatagramSocketImpl.c PlainSocketImpl.c RandomAccessFile.c ResourceBundle.c Runtime.c SecurityManager.c SocketInputStream.c SocketOutputStream.c String.c System.c Thread.c Throwable.c UnixFileSystem.c ZipEntry.c ZipFile.c
 subdir = nat
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index c78c767aec7a24afb786dfaef0c8eec690710e2a..59bb4eeb50e0768dd5891277f63e429cdb3221a3 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -29,7 +29,7 @@
    Changes: Mark Probst
             Philipp Tomsich
 
-   $Id: headers.c 664 2003-11-21 18:24:01Z jowenn $
+   $Id: headers.c 667 2003-11-21 19:05:06Z jowenn $
 
 */
 
@@ -198,7 +198,7 @@ static char *printtype (char *utf_ptr)
                case 'F':  fprintf (file, "java_floatarray*"); break;
                case 'D':  fprintf (file, "java_doublearray*"); break;
                                
-               case '[':  fprintf (file, "java_arrayarray*");                                         
+               case '[':  fprintf (file, "java_objectarray*");                                        
                        while ((c = utf_nextu2(&utf_ptr)) == '[') ;
                        if (c=='L') 
                                while (utf_nextu2(&utf_ptr) != ';');