* src/vm/signal.c (signal_thread): Restart sigwait if it has been

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

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index 11548b1229a52b12230dd514409634cd111fc554..6f2ec0b5a42d075ab52487ff7040be798c14d43d 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -1,9 +1,7 @@
 /* src/cacaoh/headers.c - functions for header generation
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: headers.c 8377 2007-08-21 11:16:03Z michi $
-
 */
 
 
@@ -43,7 +39,7 @@
 # include <ucontext.h>
 #endif
 
-#include "mm/gc-common.h"
+#include "mm/gc.hpp"
 #include "mm/memory.h"
 
 #include "toolbox/chain.h"
@@ -51,7 +47,7 @@
 
 #include "vm/builtin.h"
 #include "vm/global.h"
-#include "vm/stringlocal.h"
+#include "vm/string.hpp"
 
 #include "vmcore/class.h"
 #include "vmcore/method.h"
@@ -252,7 +248,7 @@ static void printfields(classinfo *c)
                return;
        }
                
-       printfields(c->super.cls);
+       printfields(c->super);
        
        for (i = 0; i < c->fieldscount; i++) {
                f = &(c->fields[i]);
@@ -287,7 +283,7 @@ void printmethod(methodinfo *m)
 
        /* create remarks */
        fprintf(file, "\n/*\n * Class:     ");
-       utf_fprint_printable_ascii(file, m->class->name);
+       utf_fprint_printable_ascii(file, m->clazz->name);
        fprintf(file, "\n * Method:    ");
        utf_fprint_printable_ascii(file, m->name);
        fprintf(file, "\n * Signature: ");
@@ -298,7 +294,7 @@ void printmethod(methodinfo *m)
        fprintf(file, "JNIEXPORT ");
        printtype(utf_ptr, "", "_handle");
        fprintf(file, " JNICALL Java_");
-       printID(m->class->name);
+       printID(m->clazz->name);
 
        chain_addlast(ident_chain, m->name);
 
@@ -316,8 +312,8 @@ void printmethod(methodinfo *m)
                        
        if (!(m->flags & ACC_STATIC)) {
                fprintf(file, ", struct ");
-               printID(m->class->name);
-               fprintf(file, "* this");
+               printID(m->clazz->name);
+               fprintf(file, "* _this");
 
        } else {
                fprintf(file, ", jclass clazz");