[kaffe] CVS kaffe (dalibor): Fixed compiler warning on sparc-solaris

[Kaffe CVS]

PatchSet 4284 
Date: 2004/01/07 16:11:38
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed compiler warning on sparc-solaris

2004-01-07  Dalibor Topic <robilad@kaffe.org>

        * libraries/clib/net/PlainSocketImpl.c
        [KAFFE_VMDEBUG] Merged the separate KAFFE_VMDEBUG parts
        of the file to a single part, and added \!defined(NDEBUG).
        Fixes a compiler warning on sparc-solaris.

        Reported by: Riccardo Mottola <zuse@libero.it>

Members: 
	ChangeLog:1.1871->1.1872 
	libraries/clib/net/PlainSocketImpl.c:1.37->1.38 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1871 kaffe/ChangeLog:1.1872
--- kaffe/ChangeLog:1.1871	Tue Jan  6 20:49:30 2004
+++ kaffe/ChangeLog	Wed Jan  7 16:11:38 2004
@@ -1,3 +1,12 @@
+2004-01-07  Dalibor Topic <robilad@kaffe.org>
+
+	* libraries/clib/net/PlainSocketImpl.c
+	[KAFFE_VMDEBUG] Merged the separate KAFFE_VMDEBUG parts
+	of the file to a single part, and added !defined(NDEBUG).
+	Fixes a compiler warning on sparc-solaris.
+
+        Reported by: Riccardo Mottola <zuse@libero.it>
+
 2004-01-06  Guilhem Lavaux <guilhem@kaffe.org>
 
 	* libraries/javalib/kjc.jar: Regenerated. Removed checkInitializer
Index: kaffe/libraries/clib/net/PlainSocketImpl.c
diff -u kaffe/libraries/clib/net/PlainSocketImpl.c:1.37 kaffe/libraries/clib/net/PlainSocketImpl.c:1.38
--- kaffe/libraries/clib/net/PlainSocketImpl.c:1.37	Tue Jan  6 20:13:11 2004
+++ kaffe/libraries/clib/net/PlainSocketImpl.c	Wed Jan  7 16:11:39 2004
@@ -87,9 +87,7 @@
     { java_net_SocketOptions_SO_TIMEOUT, "SO_TIMEOUT" },
     { java_net_SocketOptions_IP_MULTICAST_IF, "IP_MULTICAST_IF" }
   };
-#endif /* KAFFE_VMDEBUG */
 
-#ifdef KAFFE_VMDEBUG
 static char *
 ip2str(jint addr) 
 {
@@ -126,7 +124,7 @@
 	}
 	return addrbuf;
 }
-#endif /* KAFFE_VMDEBUG */
+#endif /* defined(KAFFE_VMDEBUG) && !defined(NDEBUG) */
 
 /*
  * Create a stream or datagram socket.