diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b104689eb9ae4909798a2597820d5b09402fe333..9318a07c6bba43079d761c784207b34649306e67 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 e1a5c33bbc6ffbdc29ac1402babeb8c4f075f0a4..ee7792b07887ab319e78a74536f3435c8a65a2c5 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 007aabc40085a89668b227b5ac37dc21e2e9bc27..3e8b11bbe8df446c42047d89b0cb63e0d921fc4b 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 8c037ed6381ac7e8857b0b2c59dabb95a2da46b3..236bc4dcebfe6a4ae02f6b16e130bcc7bf31d9d2 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;