From: Tom Tromey <tromey@redhat.com>
Date: Wed, 17 Jan 2007 01:36:33 +0000 (+0000)
Subject: natThread.cc (finalize_native): Remove cast.
X-Git-Tag: releases/gcc-4.3.0~7461
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98685f2b44e1488e0c2f025c3ba0e946c247a63b;p=thirdparty%2Fgcc.git

natThread.cc (finalize_native): Remove cast.

	* java/lang/natThread.cc (finalize_native): Remove cast.
	(_Jv_GetCurrentJNIEnv): Likewise.
	* include/jvm.h (struct natThread) <jni_env>: Declare as
	_Jv_JNIEnv*.

From-SVN: r120844
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index de8a12326e60..d1377e669bc1 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 203e0d953565..2da13bca4dc9 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 2472d4d30053..9e2f7dd674d9 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