From 8928191114d5e13d4649a79dea5ca0328285fb8c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@cygnus.com>
Date: Wed, 2 Feb 2000 01:47:01 +0000
Subject: [PATCH] * include/jni.h (class _Jv_JNIEnv): Corrected calls using
 `...'.

From-SVN: r31745
---
 libjava/ChangeLog     |  2 ++
 libjava/include/jni.h | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c80e84ed7f2..b9e61234f08 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,7 @@
 2000-02-01  Tom Tromey  <tromey@cygnus.com>
 
+	* include/jni.h (class _Jv_JNIEnv): Corrected calls using `...'.
+
 	* include/jni.h (class _Jv_JNIEnv): Added all C++ inline methods.
 
 	* jni.cc (_Jv_JNI_PopLocalFrame): Leave loop when `n == NULL'.
diff --git a/libjava/include/jni.h b/libjava/include/jni.h
index 235a3799917..fa2fddc5e0e 100644
--- a/libjava/include/jni.h
+++ b/libjava/include/jni.h
@@ -790,7 +790,7 @@ public:
   jobject CallNonvirtualObjectMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jobject result = p->CallNonvirtualObjectMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -805,7 +805,7 @@ public:
   jboolean CallNonvirtualBooleanMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jboolean result = p->CallNonvirtualBooleanMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -820,7 +820,7 @@ public:
   jbyte CallNonvirtualByteMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jbyte result = p->CallNonvirtualByteMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -835,7 +835,7 @@ public:
   jchar CallNonvirtualCharMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jchar result = p->CallNonvirtualCharMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -850,7 +850,7 @@ public:
   jshort CallNonvirtualShortMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jshort result = p->CallNonvirtualShortMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -865,7 +865,7 @@ public:
   jint CallNonvirtualIntMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jint result = p->CallNonvirtualIntMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -880,7 +880,7 @@ public:
   jlong CallNonvirtualLongMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jlong result = p->CallNonvirtualLongMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -895,7 +895,7 @@ public:
   jfloat CallNonvirtualFloatMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jfloat result = p->CallNonvirtualFloatMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -910,7 +910,7 @@ public:
   jdouble CallNonvirtualDoubleMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jdouble result = p->CallNonvirtualDoubleMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -925,7 +925,7 @@ public:
   void CallNonvirtualVoidMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     p->CallNonvirtualVoidMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
   }
-- 
2.30.2