2 files changed, 16 insertions, 8 deletions
diff --git a/libjava/classpath/java/awt/geom/GeneralPath.java b/libjava/classpath/java/awt/geom/GeneralPath.java
index 15fb8ab..123833b 100644
--- a/libjava/classpath/java/awt/geom/GeneralPath.java
+++ b/libjava/classpath/java/awt/geom/GeneralPath.java
@@ -1,5 +1,5 @@
 /* GeneralPath.java -- represents a shape built from subpaths
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation
+   Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -79,8 +79,16 @@ import java.awt.Shape;
  */
 public final class GeneralPath implements Shape, Cloneable
 {
-  public static final int WIND_EVEN_ODD = PathIterator.WIND_EVEN_ODD;
-  public static final int WIND_NON_ZERO = PathIterator.WIND_NON_ZERO;
+  // WORKAROUND for gcj 4.0.x (x < 3)
+  // fully qualify PathIterator constants.
+
+  /** Same constant as {@link PathIterator#WIND_EVEN_ODD}. */
+  public static final int WIND_EVEN_ODD
+    = java.awt.geom.PathIterator.WIND_EVEN_ODD;
+
+  /** Same constant as {@link PathIterator.WIND_NON_ZERO}. */
+  public static final int WIND_NON_ZERO
+    = java.awt.geom.PathIterator.WIND_NON_ZERO;
 
   /** Initial size if not specified. */
   private static final int INIT_SIZE = 10;
diff --git a/libjava/classpath/java/awt/geom/Point2D.java b/libjava/classpath/java/awt/geom/Point2D.java
index 9f22a5a..a2689ab 100644
--- a/libjava/classpath/java/awt/geom/Point2D.java
+++ b/libjava/classpath/java/awt/geom/Point2D.java
@@ -1,5 +1,5 @@
 /* Point2D.java -- generic point in 2-D space
-   Copyright (C) 1999, 2000, 2002, 2004  Free Software Foundation
+   Copyright (C) 1999, 2000, 2002, 2004, 2006,  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -135,7 +135,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distanceSq(double x, double y)
   {
-    return distanceSq(getX(), x, getY(), y);
+    return distanceSq(getX(), getY(), x, y);
   }
 
   /**
@@ -147,7 +147,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distanceSq(Point2D p)
   {
-    return distanceSq(getX(), p.getX(), getY(), p.getY());
+    return distanceSq(getX(), getY(), p.getX(), p.getY());
   }
 
   /**
@@ -159,7 +159,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distance(double x, double y)
   {
-    return distance(getX(), x, getY(), y);
+    return distance(getX(), getY(), x, y);
   }
 
   /**
@@ -171,7 +171,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distance(Point2D p)
   {
-    return distance(getX(), p.getX(), getY(), p.getY());
+    return distance(getX(), getY(), p.getX(), p.getY());
   }
 
   /**