From 1857f8d79f7ee98d5bb14a3ee1b0849f4b305707 Mon Sep 17 00:00:00 2001
From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 1 Feb 2004 20:05:03 +0000
Subject: [PATCH] 2004-02-01 Michael Koch <konqueror@gmx.de>
* include/jvm.h (MAYBE_UNUSED): New macro tp mark probably unused
arguments.
* jni.cc (_Jv_LookupJNIMethod): Mark 'args_size' unused.
* verify.cc (debug_print): Mark 'fmt' unused.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77079 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 7 +++++++
libjava/include/jvm.h | 3 +++
libjava/jni.cc | 2 +-
libjava/verify.cc | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b104689eb9ae..9318a07c6bba 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-01 Michael Koch <konqueror@gmx.de>
+
+ * include/jvm.h (MAYBE_UNUSED): New macro tp mark probably unused
+ arguments.
+ * jni.cc (_Jv_LookupJNIMethod): Mark 'args_size' unused.
+ * verify.cc (debug_print): Mark 'fmt' unused.
+
2004-01-30 Michael Koch <konqueror@gmx.de>
* configure.in: Use pkg-config to check for GTK 2.2 and libart 2.1.
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index e1a5c33bbc6f..ee7792b07887 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -30,6 +30,9 @@ details. */
#include <gcj/cni.h>
#include <gcj/field.h>
+/* Macro for possible unused arguments. */
+#define MAYBE_UNUSED __attribute__((__unused__))
+
/* Structure of the virtual table. */
struct _Jv_VTable
{
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 007aabc40085..3e8b11bbe8df 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -2051,7 +2051,7 @@ _Jv_GetJNIEnvNewFrame (jclass klass)
// This is `extern "C"' because the compiler uses it.
extern "C" void *
_Jv_LookupJNIMethod (jclass klass, _Jv_Utf8Const *name,
- _Jv_Utf8Const *signature, int args_size)
+ _Jv_Utf8Const *signature, MAYBE_UNUSED int args_size)
{
char buf[10 + 6 * (name->length + signature->length) + 12];
int long_start;
diff --git a/libjava/verify.cc b/libjava/verify.cc
index 8c037ed6381a..236bc4dcebfe 100644
--- a/libjava/verify.cc
+++ b/libjava/verify.cc
@@ -40,7 +40,7 @@ static void debug_print (const char *fmt, ...)
__attribute__ ((format (printf, 1, 2)));
static inline void
-debug_print (const char *fmt, ...)
+debug_print (MAYBE_UNUSED const char *fmt, ...)
{
#ifdef VERIFY_DEBUG
va_list ap;
--
GitLab