* Removed vm/tables.h include.

diff --git a/src/threads/native/generic-primitives.h b/src/threads/native/generic-primitives.h
index dcc3195f74c109c08f66ddd8ea23894fc4970e2f..659f817e2271f2ed4a68174c4a32835fb64baa17 100644 (file)
--- a/src/threads/native/generic-primitives.h
+++ b/src/threads/native/generic-primitives.h
@@ -1,3 +1,40 @@
+/* src/threads/native/generic-primitives.h - machine independent atomic
+                                             operations
+
+   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.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+   Contact: cacao@complang.tuwien.ac.at
+
+   Authors: Christian Thalinger
+            Anton Ertl
+
+   Changes: 
+
+   $Id: generic-primitives.h 3830 2005-12-01 23:07:33Z twisti $
+
+*/
+
+
 #ifndef _MACHINE_INSTR_H
 #define _MACHINE_INSTR_H
 
@@ -45,3 +82,17 @@ static inline long compare_and_swap(volatile long *p, long oldval, long newval)
 #define MEMORY_BARRIER_AFTER_ATOMIC()     /* nothing */
 
 #endif /* _MACHINE_INSTR_H */
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index 08a0c420fc4626dacf53f4a3803a93ceb6ea783f..98da3f941390ffd3c2e463f82d5ceaf834bfb905 100644 (file)
--- a/src/threads/native/threads.c
+++ b/src/threads/native/threads.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: threads.c 3570 2005-11-04 16:58:36Z motse $
+   $Id: threads.c 3830 2005-12-01 23:07:33Z twisti $
 
 */
 
@@ -73,7 +73,6 @@
 #include "vm/loader.h"
 #include "vm/options.h"
 #include "vm/stringlocal.h"
-#include "vm/tables.h"
 #include "vm/jit/asmpart.h"
 
 #if !defined(__DARWIN__)

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 175f9b640337a131a16cd4a46b7998eff62f6208..4dade8c93473343a5a138727dc0c9eaf95896820 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: threads.h 3570 2005-11-04 16:58:36Z motse $
+   $Id: threads.h 3830 2005-12-01 23:07:33Z twisti $
 
 */
 
@@ -52,7 +52,6 @@
 #include "native/include/java_lang_Thread.h"
 #include "native/include/java_lang_VMThread.h"
 #include "vm/global.h"
-#include "vm/tables.h"
 
 #if defined(__DARWIN__)
 #include <mach/mach.h>