* src/vmcore/field.h (fieldinfo): Renamed class to clazz.

[cacao.git] / src / vmcore / field.h

diff --git a/src/vmcore/field.h b/src/vmcore/field.h
index 6470d2580b663590b6c5aa93536235bff1c5bd8f..32c3871c4a54e968702a43d120dcdfb5b4f761e1 100644 (file)
--- a/src/vmcore/field.h
+++ b/src/vmcore/field.h
@@ -1,9 +1,7 @@
 /* src/vmcore/field.h - field functions header
 
-   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,7 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: field.h 8321 2007-08-16 11:37:25Z michi $
 */
 
 
@@ -54,7 +51,7 @@ struct fieldinfo {          /* field of a class                                 */
        /*          value as CLASSREF_PSEUDO_VFTBL! This is used to check whether */
        /*          a constant_FMIref has been resolved.                          */
 
-       classinfo *class;     /* needed by typechecker. Could be optimized        */
+       classinfo *clazz;     /* needed by typechecker. Could be optimized        */
                              /* away by using constant_FMIref instead of         */
                              /* fieldinfo throughout the compiler.               */
 
@@ -76,9 +73,7 @@ bool       field_load(classbuffer *cb, fieldinfo *f, descriptor_pool *descpool);
 classinfo *field_get_type(fieldinfo *f);
 void       field_free(fieldinfo *f);
 
-#if defined(ENABLE_ANNOTATIONS)
-java_bytearray *field_get_annotations(fieldinfo *f);
-#endif
+java_handle_bytearray_t *field_get_annotations(fieldinfo *f);
 
 #if !defined(NDEBUG)
 void field_printflags(fieldinfo *f);