GNU header update.

[cacao.git] / src / vm / jit / inline / sets.c

diff --git a/src/vm/jit/inline/sets.c b/src/vm/jit/inline/sets.c
index 8d97e14764164d26e60bc1a1f51ce3199be2ec5b..4967d9b9decd004cb9b0ced13d67a1417a3232c2 100644 (file)
--- a/src/vm/jit/inline/sets.c
+++ b/src/vm/jit/inline/sets.c
@@ -1,10 +1,9 @@
-/* jit/sets.c -
+/* vm/jit/inline/sets.c -
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Institut f. Computersprachen, TU Wien
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
-   S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
-   J. Wenninger
+   Copyright (C) 1996-2005 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
 
    This file is part of CACAO.
 
@@ -27,18 +26,19 @@
 
    Authors: Carolyn Oates
 
-   $Id: sets.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: sets.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
 
 #include <stdio.h>
-#include "sets.h"
+
 #include "types.h"
-#include "global.h"
-#include "loader.h"
-#include "tables.h"
-#include "toolbox/memory.h"
+#include "mm/memory.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/tables.h"
+#include "vm/jit/inline/sets.h"
 
 
 /*
@@ -354,8 +354,8 @@ classSetNode * intersectSubtypesWithSet(classinfo *t, classSetNode *s) {
 
        /* for each s class */
        for (c=s; c != NULL; c = c->nextClass) {
-               vftbl *t_cl_vt = t->vftbl;
-               vftbl *c_cl_vt = c->classType->vftbl;
+               vftbl_t *t_cl_vt = t->vftbl;
+               vftbl_t *c_cl_vt = c->classType->vftbl;
 
                /* if s class is in the t Class range */
                if (  (t_cl_vt->baseval <=  c_cl_vt->baseval)