[kaffe] CVS kaffe (guilhem): Fixed a compile error.

Kaffe CVS cvs-commits at kaffe.org
Mon Apr 12 23:07:02 PDT 2004


PatchSet 4637 
Date: 2004/04/13 05:46:13
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fixed a compile error.

        * libraries/clib/nio/FileChannelImpl.c
        (Java_gnu_java_nio_channels_FileChannelImpl_mapImpl): Fixed a compile
        error on some platforms (moved a declaration above a piece of code).

Members: 
	ChangeLog:1.2213->1.2214 
	libraries/clib/nio/FileChannelImpl.c:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2213 kaffe/ChangeLog:1.2214
--- kaffe/ChangeLog:1.2213	Mon Apr 12 16:12:20 2004
+++ kaffe/ChangeLog	Tue Apr 13 05:46:13 2004
@@ -1,5 +1,11 @@
 2004-04-12  Guilhem Lavaux <guilhem at kaffe.org>
 
+	* libraries/clib/nio/FileChannelImpl.c
+	(Java_gnu_java_nio_channels_FileChannelImpl_mapImpl): Fixed a compile
+	error on some platforms (moved a declaration above a piece of code).
+
+2004-04-12  Guilhem Lavaux <guilhem at kaffe.org>
+
 	* libraries/javalib/bootstrap.classlist: Added some missing classes
 	needed to run kjc with the new NIO structure.
 
Index: kaffe/libraries/clib/nio/FileChannelImpl.c
diff -u kaffe/libraries/clib/nio/FileChannelImpl.c:1.1 kaffe/libraries/clib/nio/FileChannelImpl.c:1.2
--- kaffe/libraries/clib/nio/FileChannelImpl.c:1.1	Mon Apr 12 11:40:09 2004
+++ kaffe/libraries/clib/nio/FileChannelImpl.c	Tue Apr 13 05:46:14 2004
@@ -292,7 +292,7 @@
 Java_gnu_java_nio_channels_FileChannelImpl_mapImpl(JNIEnv *env, jobject filechannel,
 						   jchar mode, jlong pos, jint size)
 {
-  // Kaffe's mmapping mode corresponds exactly to java.nio.channels.FileChannel.MapMode numbers.
+  /* Kaffe's mmapping mode corresponds exactly to java.nio.channels.FileChannel.MapMode numbers. */
   void *memory;
   int rc;
   int nativeFd = (int)getFD(env, filechannel);
@@ -302,10 +302,10 @@
   jobject bytebuffer;
   jmethodID bytebuffer_init = (*env)->GetMethodID(env, bytebuffer_class, "<init>", "(Lgnu/classpath/RawData;IZ)V");
 
+  int nativeMode;
+
   assert(bytebuffer_class != NULL);
   assert(bytebuffer_init != NULL);
-
-  int nativeMode;
 
   switch (mode) 
     {




More information about the kaffe mailing list