From c314ee353b786d5e3faf3dab20601a278608249d Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Sat, 9 Mar 2002 08:25:13 -0800 Subject: [PATCH] * gnu/gcj/xlib/WindowAttributes.java Assign null to RawData, not 0. * gnu/gcj/xlib/XImage.java: Likewise. * gnu/gcj/xlib/XColor.java: Likewise. From-SVN: r50498 --- libjava/ChangeLog | 6 ++++++ libjava/gnu/gcj/xlib/WindowAttributes.java | 8 ++++---- libjava/gnu/gcj/xlib/XColor.java | 2 +- libjava/gnu/gcj/xlib/XImage.java | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b2a8b0bdca7..2ce41268bbf 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-03-09 Per Bothner + + * gnu/gcj/xlib/WindowAttributes.java Assign null to RawData, not 0. + * gnu/gcj/xlib/XImage.java: Likewise. + * gnu/gcj/xlib/XColor.java: Likewise. + 2002-03-09 Adam Megacz * java/lang/Win32Process.java (ConcreteProcess): Now throws an diff --git a/libjava/gnu/gcj/xlib/WindowAttributes.java b/libjava/gnu/gcj/xlib/WindowAttributes.java index 72a3bb87de8..6efeaa5d434 100644 --- a/libjava/gnu/gcj/xlib/WindowAttributes.java +++ b/libjava/gnu/gcj/xlib/WindowAttributes.java @@ -45,8 +45,8 @@ public class WindowAttributes { WindowAttributes attributes = (WindowAttributes) super.clone(); // In case of an exception before the stucture is copied. - attributes.in = 0; - attributes.out = 0; + attributes.in = null; + attributes.out = null; // FIXME: do anything else? @@ -77,13 +77,13 @@ public class WindowAttributes * Reference to XWindowAttribute structure containing attributes * read from a window. */ - RawData in = 0; + RawData in = null; /** * Reference to XSetWindowAttribute structure containing attributes * to be applied to a window. */ - RawData out = 0; + RawData out = null; long mask; diff --git a/libjava/gnu/gcj/xlib/XColor.java b/libjava/gnu/gcj/xlib/XColor.java index 7abcc1713f1..74ad6d7071a 100644 --- a/libjava/gnu/gcj/xlib/XColor.java +++ b/libjava/gnu/gcj/xlib/XColor.java @@ -38,5 +38,5 @@ public final class XColor public final native byte getFlags(); public final native long getPixelValue(); - RawData structure = 0; + RawData structure = null; } diff --git a/libjava/gnu/gcj/xlib/XImage.java b/libjava/gnu/gcj/xlib/XImage.java index 1b102f9ea76..5460549e0a5 100644 --- a/libjava/gnu/gcj/xlib/XImage.java +++ b/libjava/gnu/gcj/xlib/XImage.java @@ -141,7 +141,7 @@ public class XImage protected native void finalize(); boolean ownsData = false; - RawData structure = 0; + RawData structure = null; public final native int getWidth(); public final native int getHeight(); -- 2.30.2