Merged revisions 7797-7917 via svnmerge from

[cacao.git] / src / vm / jit / patcher.h

diff --git a/src/vm/jit/patcher.h b/src/vm/jit/patcher.h
index 9b2c5916c99c9267ceed107dd48fb65e357bda82..a321ce7fe2c4a19597b1efb49626de6f99f72d56 100644 (file)
--- a/src/vm/jit/patcher.h
+++ b/src/vm/jit/patcher.h
@@ -1,6 +1,6 @@
 /* src/vm/jit/patcher.h - code patching functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -22,13 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes: Edwin Steiner
-
-   $Id: patcher.h 5929 2006-11-06 17:13:40Z twisti $
+   $Id: patcher.h 7813 2007-04-25 19:20:13Z twisti $
 
 */
 
@@ -42,9 +36,7 @@
 
 #include "vm/types.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "vm/global.h"