Re: build failure

[Mark Wielaard]

Hi,

On Fri, 2002-11-15 at 15:31, Eric Blake wrote:
> Tom Tromey wrote:
> > Today I updated and rebuilt classpath.
> > I use `--with-jikes --with-jni' to compile.
> > I'm using jikes 1.15.
>
> I fixed the imports, but setting the field cap across package boundaries 
> is more difficult. I think java.nio.Buffer needs to be rewritten to 
> store its data in public fields in a helper class in 
> gnu.java.nio.Buffer, rather than in default fields directly in Buffer. 
> Otherwise, the implementation classes need to be moved to package 
> java.nio.

Thanks. I just applied the attached (but clearly wrong) patch to
Buffer.java so that everything compiles again. Hopefully Michael will
have time to look into a real solution. And maybe Tom can look into the
GtkWindowPeer.c issue.

Cheers,

Mark

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.710
diff -u -r1.710 ChangeLog
--- ChangeLog   15 Nov 2002 14:24:48 -0000      1.710
+++ ChangeLog   15 Nov 2002 20:19:53 -0000
@@ -1,3 +1,12 @@
+2002-11-15  Mark Wielaard <address@hidden>
+
+       * java/nio/Buffer.java (cap): Make field protected for now to get
+       things compiling. Added a FIXME.
+
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+       (Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setBounds): Declare widget
+       before use.
+
 2002-11-15  Eric Blake  <address@hidden>
 
        * gnu/java/nio/FileChannelImpl.java (write, read): Add missing
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c   10 Nov 2002 
07:59:05 -0000      1.5
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c   15 Nov 2002 
20:19:53 -0000
@@ -230,12 +230,13 @@
   (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
 {
   void *ptr;
+  GtkWidget *widget;
 
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
 
-  GtkWidget *widget = GTK_WIDGET (ptr);
+  widget = GTK_WIDGET (ptr);
   setBounds (widget, x, y, width, height);
 
   gdk_threads_leave ();
Index: java/nio/Buffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/Buffer.java,v
retrieving revision 1.4
diff -u -r1.4 Buffer.java
--- java/nio/Buffer.java        13 Nov 2002 10:53:38 -0000      1.4
+++ java/nio/Buffer.java        15 Nov 2002 20:19:53 -0000
@@ -39,7 +39,10 @@
 
 public abstract class Buffer
 {
-  int cap = 0;
+  /** Capacity of the buffer.
+   * XXX - FIXME - should not be protected but (package) private
+   * */
+  protected int cap = 0;
   int limit = 0;
   int pos = 0;
   int mark = -1;