aboutsummaryrefslogtreecommitdiff
path: root/libjava/include
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-03-17 00:18:50 +0000
committerTom Tromey <tromey@gcc.gnu.org>2005-03-17 00:18:50 +0000
commitf37a936b5693300c762ce969380003e74b5911fd (patch)
tree1c077bcd3965d1e954aabcae14e7bacf373670a5 /libjava/include
parent4c7e54712993900d57a3d533e8ad32d9c17fb80c (diff)
downloadgcc-f37a936b5693300c762ce969380003e74b5911fd.zip
gcc-f37a936b5693300c762ce969380003e74b5911fd.tar.gz
gcc-f37a936b5693300c762ce969380003e74b5911fd.tar.bz2
link.cc (ensure_class_linked): Removed #ifdef.
* link.cc (ensure_class_linked): Removed #ifdef. (print_class_loaded): Likewise. (wait_for_state): Likewise. * java/lang/Class.h (_Jv_IsInterpretedClass): Always declare. * include/jvm.h (_Jv_IsInterpretedClass): Moved from... * include/java-interp.h: ... here. From-SVN: r96589
Diffstat (limited to 'libjava/include')
-rw-r--r--libjava/include/java-interp.h8
-rw-r--r--libjava/include/jvm.h9
2 files changed, 10 insertions, 7 deletions
diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h
index 5692861..0615200 100644
--- a/libjava/include/java-interp.h
+++ b/libjava/include/java-interp.h
@@ -1,6 +1,6 @@
// java-interp.h - Header file for the bytecode interpreter. -*- c++ -*-
-/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
This file is part of libgcj.
@@ -32,12 +32,6 @@ extern "C" {
#include <ffi.h>
}
-extern inline jboolean
-_Jv_IsInterpretedClass (jclass c)
-{
- return (c->accflags & java::lang::reflect::Modifier::INTERPRETED) != 0;
-}
-
struct _Jv_ResolvedMethod;
void _Jv_InitInterpreter ();
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index 4dfdb4d..6234788 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -572,4 +572,13 @@ _Jv_CheckABIVersion (unsigned long value)
|| value == (GCJ_VERSION + GCJ_BINARYCOMPAT_ADDITION));
}
+// It makes the source cleaner if we simply always define this
+// function. If the interpreter is not built, it will never return
+// 'true'.
+extern inline jboolean
+_Jv_IsInterpretedClass (jclass c)
+{
+ return (c->accflags & java::lang::reflect::Modifier::INTERPRETED) != 0;
+}
+
#endif /* __JAVA_JVM_H__ */