* renamed CACAO_TYPECHECK to ENABLE_VERIFIER

[cacao.git] / src / vm / references.h

diff --git a/src/vm/references.h b/src/vm/references.h
index 0810af4c5c4a8e8dc6817caabe1a2512b7b73b16..603309fe3a571456d41e924932e5c06d138c633b 100644 (file)
--- a/src/vm/references.h
+++ b/src/vm/references.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: references.h 2181 2005-04-01 16:53:33Z edwin $
+   $Id: references.h 2561 2005-06-06 15:21:19Z twisti $
 
 */
 
@@ -38,6 +38,7 @@
 #include "vm/global.h"
 #include "vm/utf8.h"
 
+
 /*----------------------------------------------------------------------------*/
 /* References                                                                 */
 /*                                                                            */
@@ -61,6 +62,7 @@ typedef struct classinfo classinfo;
 typedef struct typedesc typedesc;
 typedef struct methoddesc methoddesc;
 
+
 /* structs ********************************************************************/
 
 /* constant_classref **********************************************************/
@@ -71,6 +73,7 @@ typedef struct constant_classref {
        utf       *name;              /* name of the class refered to             */
 } constant_classref;
 
+
 /* classref_or_classinfo ******************************************************/
 
 typedef union {
@@ -79,6 +82,7 @@ typedef union {
        void              *any;       /* used for general access (x != NULL,...)  */
 } classref_or_classinfo;
 
+
 /* parseddesc *****************************************************************/
 
 typedef union parseddesc {
@@ -87,16 +91,17 @@ typedef union parseddesc {
        void              *any;       /* used for simple test against NULL        */
 } parseddesc;
 
+
 /* constant_FMIref ************************************************************/
 
 typedef struct {            /* Fieldref, Methodref and InterfaceMethodref     */
-       classinfo *class;       /* class containing this field/method/intfmeth.   */ /* XXX remove */
        constant_classref *classref;  /* class containing this field/meth./intfm. */
        utf       *name;        /* field/method/interfacemethod name              */
        utf       *descriptor;  /* field/method/intfmeth. type descriptor string  */
        parseddesc parseddesc;  /* parsed descriptor                              */
 } constant_FMIref;
 
+
 /* macros *********************************************************************/
 
 /* a value that never occurrs in classinfo.header.vftbl                       */
@@ -112,10 +117,13 @@ typedef struct {            /* Fieldref, Methodref and InterfaceMethodref     */
        (*((classref_or_classinfo *)(&(value))))
 
 /* initialize a constant_classref with referer `ref` and name `classname`     */
-#define CLASSREF_INIT(c,ref,classname)                          \
-                       do { (c).pseudo_vftbl = CLASSREF_PSEUDO_VFTBL;      \
-                                (c).referer = (ref);                           \
-                                (c).name = (classname); } while (0)
+
+#define CLASSREF_INIT(c,ref,classname) \
+    do { \
+        (c).pseudo_vftbl = CLASSREF_PSEUDO_VFTBL; \
+        (c).referer = (ref); \
+        (c).name = (classname); \
+    } while (0)
 
 #endif /* _REFERENCES_H_ */