* Removed all Id tags.

[cacao.git] / src / cacaoh / headers.c

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index 1016e30fd9206e511609afbedd80e71c5adf92f1..ab25e9b2a1b6de3740dc62164221169825aa10ac 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: headers.c 8123 2007-06-20 23:50:55Z michi $
-
 */
 
 
@@ -174,24 +172,24 @@ static char *printtype(char *utf_ptr)
                fprintf(file, "double");
                break;
        case '[':
-               addoutputsize ( sizeof(java_arrayheader*) ); 
+               addoutputsize ( sizeof(java_array_t*) ); 
                switch (utf_nextu2(&utf_ptr)) {
-               case 'I':  fprintf (file, "java_intarray*"); break;
-               case 'J':  fprintf (file, "java_longarray*"); break;
-               case 'Z':  fprintf (file, "java_booleanarray*"); break;
-               case 'B':  fprintf (file, "java_bytearray*"); break;
-               case 'S':  fprintf (file, "java_shortarray*"); break;
-               case 'C':  fprintf (file, "java_chararray*"); break;
-               case 'F':  fprintf (file, "java_floatarray*"); break;
-               case 'D':  fprintf (file, "java_doublearray*"); break;
+               case 'I':  fprintf (file, "java_intarray_t*"); break;
+               case 'J':  fprintf (file, "java_longarray_t*"); break;
+               case 'Z':  fprintf (file, "java_booleanarray_t*"); break;
+               case 'B':  fprintf (file, "java_bytearray_t*"); break;
+               case 'S':  fprintf (file, "java_shortarray_t*"); break;
+               case 'C':  fprintf (file, "java_chararray_t*"); break;
+               case 'F':  fprintf (file, "java_floatarray_t*"); break;
+               case 'D':  fprintf (file, "java_doublearray_t*"); break;
                                
-               case '[': fprintf(file, "java_objectarray*");
+               case '[': fprintf(file, "java_objectarray_t*");
                        while ((c = utf_nextu2(&utf_ptr)) == '[');
                        if (c == 'L')
                                while (utf_nextu2(&utf_ptr) != ';');
                        break;
                            
-               case 'L':  fprintf(file, "java_objectarray*");
+               case 'L':  fprintf(file, "java_objectarray_t*");
                        while (utf_nextu2(&utf_ptr) != ';');
                        break;
                default:
@@ -201,7 +199,7 @@ static char *printtype(char *utf_ptr)
                break;
                
        case 'L': 
-               addoutputsize ( sizeof(java_objectheader*));
+               addoutputsize ( sizeof(java_object_t*));
                fprintf (file, "struct ");
                while ( (c = utf_nextu2(&utf_ptr)) != ';' ) printIDpart (c);     
                fprintf (file, "*");
@@ -241,8 +239,8 @@ static void printfields(classinfo *c)
        int ident_count;
        
        if (!c) {
-               addoutputsize(sizeof(java_objectheader));
-               fprintf(file, "   java_objectheader header;\n");
+               addoutputsize(sizeof(java_object_t));
+               fprintf(file, "   java_object_t header;\n");
                return;
        }