* configure.ac (static-classpath): Removed.

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

diff --git a/src/vm/jit/patcher.h b/src/vm/jit/patcher.h
index 5e9288371f429c0717b13b881ae74c9357c6a94f..68b167468dd90272c52fbb9a7b7f6abf1e029b35 100644 (file)
--- a/src/vm/jit/patcher.h
+++ b/src/vm/jit/patcher.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.h 8160 2007-06-28 01:52:19Z michi $
-
 */
 
 
@@ -41,7 +39,7 @@
 #include "vm/global.h"
 
 
-#if defined(__ARM__)
+#if defined(__ALPHA__) || defined(__ARM__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__S390__)
 # error "you should no longer include this file"
 #else
 
@@ -93,7 +91,7 @@
 
 /* function prototypes ********************************************************/
 
-java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra);
+java_object_t *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra);
 #define PATCHER_wrapper (functionptr) patcher_wrapper
 
 bool patcher_resolve_class(u1 *sp);
@@ -111,10 +109,8 @@ bool patcher_resolve_classref_to_vftbl(u1 *sp);
 bool patcher_resolve_classref_to_flags(u1 *sp);
 #define PATCHER_resolve_classref_to_flags (functionptr) patcher_resolve_classref_to_flags
 
-#if !defined(WITH_STATIC_CLASSPATH)
 bool patcher_resolve_native_function(u1 *sp);
 #define PATCHER_resolve_native_function (functionptr) patcher_resolve_native_function
-#endif
 
 
 bool patcher_get_putstatic(u1 *sp);
@@ -199,10 +195,8 @@ bool patcher_clinit(u1 *sp);
 bool patcher_athrow_areturn(u1 *sp);
 #define PATCHER_athrow_areturn (functionptr) patcher_athrow_areturn
 
-#if !defined(WITH_STATIC_CLASSPATH)
 bool patcher_resolve_native(u1 *sp);
 #define PATCHER_resolve_native (functionptr) patcher_resolve_native
-#endif
 
 
 /* stuff for the interpreter **************************************************/