diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natThread.cc | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index de8a123..d1377e6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2007-01-16 Tom Tromey <tromey@redhat.com> + + * java/lang/natThread.cc (finalize_native): Remove cast. + (_Jv_GetCurrentJNIEnv): Likewise. + * include/jvm.h (struct natThread) <jni_env>: Declare as + _Jv_JNIEnv*. + 2007-01-16 Keith Seitz <keiths@redhat.com> * testsuite/libjava.jvmti/natevents.cc (FieldModificationCB): Use diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 203e0d9..2da13bc 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -1,6 +1,6 @@ // jvm.h - Header file for private implementation information. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation This file is part of libgcj. @@ -762,7 +762,7 @@ struct natThread _Jv_Thread_t *thread; // Each thread has its own JNI object. - void *jni_env; + _Jv_JNIEnv *jni_env; }; #endif /* __JAVA_JVM_H__ */ diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc index 2472d4d..9e2f7dd 100644 --- a/libjava/java/lang/natThread.cc +++ b/libjava/java/lang/natThread.cc @@ -1,6 +1,6 @@ // natThread.cc - Native part of Thread class. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2007 Free Software Foundation This file is part of libgcj. @@ -441,7 +441,7 @@ _Jv_GetCurrentJNIEnv () java::lang::Thread *t = _Jv_ThreadCurrent (); if (t == NULL) return NULL; - return (JNIEnv *)((natThread *) t->data)->jni_env; + return ((natThread *) t->data)->jni_env; } void |