This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gcjx] Patch: FYI: warning avoidance
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 17 Apr 2005 14:38:05 -0600
- Subject: [gcjx] Patch: FYI: warning avoidance
- Reply-to: tromey at redhat dot com
I'm checking this in on the gcjx branch.
This fixes a few warnings in libjava/. The shs.h one has been around
for a long time; the others were found by gcjx.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* gnu/gcj/io/shs.h (PROTO): Define.
* gnu/awt/xlib/XGraphics.java: Sorted imports and removed
duplicate.
* gnu/gcj/runtime/SharedLibHelper.java: Sorted imports and removed
duplicate.
Index: gnu/awt/xlib/XGraphics.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/xlib/XGraphics.java,v
retrieving revision 1.8
diff -u -r1.8 XGraphics.java
--- gnu/awt/xlib/XGraphics.java 14 May 2004 22:17:44 -0000 1.8
+++ gnu/awt/xlib/XGraphics.java 17 Apr 2005 20:37:20 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003, 2004 Free Software Foundation
+/* Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation
This file is part of libgcj.
@@ -15,13 +15,12 @@
import java.awt.image.ColorModel;
import java.awt.image.ImageObserver;
import java.awt.image.BufferedImage;
-import gnu.gcj.xlib.GC;
-import gnu.gcj.xlib.XImage;
-import gnu.gcj.xlib.Drawable;
-import gnu.gcj.xlib.Window;
import gnu.gcj.xlib.Drawable;
+import gnu.gcj.xlib.GC;
import gnu.gcj.xlib.Pixmap;
import gnu.gcj.xlib.Visual;
+import gnu.gcj.xlib.Window;
+import gnu.gcj.xlib.XImage;
import gnu.awt.j2d.DirectRasterGraphics;
import gnu.awt.j2d.MappedRaster;
Index: gnu/gcj/io/shs.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/io/shs.h,v
retrieving revision 1.3
diff -u -r1.3 shs.h
--- gnu/gcj/io/shs.h 15 Mar 2002 21:59:12 -0000 1.3
+++ gnu/gcj/io/shs.h 17 Apr 2005 20:37:20 -0000
@@ -49,6 +49,9 @@
# undef PROTO
#endif
+/* GCJ LOCAL: we always want prototypes. */
+#define PROTO
+
/* Used to remove arguments in function prototypes for non-ANSI C */
#ifdef PROTO
# define OF(a) a
Index: gnu/gcj/runtime/SharedLibHelper.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/runtime/SharedLibHelper.java,v
retrieving revision 1.2
diff -u -r1.2 SharedLibHelper.java
--- gnu/gcj/runtime/SharedLibHelper.java 25 Nov 2004 03:46:59 -0000 1.2
+++ gnu/gcj/runtime/SharedLibHelper.java 17 Apr 2005 20:37:20 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2003, 2004 Free Software Foundation
+/* Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation
This file is part of libgcj.
@@ -7,18 +7,18 @@
details. */
package gnu.gcj.runtime;
+
+import gnu.gcj.Core;
+import java.io.*;
import java.lang.ref.WeakReference;
-import java.net.URL;
import java.net.MalformedURLException;
-import java.util.HashMap;
+import java.net.URL;
+import java.nio.channels.FileChannel;
import java.security.*;
-import gnu.gcj.Core;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.HashSet;
import java.util.HashMap;
-import java.nio.channels.FileChannel;
-import java.io.*;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
public class SharedLibHelper
{