[kaffe] CVS kaffe (dalibor): Small fix for compiler warning

Kaffe CVS cvs-commits at kaffe.org
Mon Mar 15 10:24:02 PST 2004


PatchSet 4522 
Date: 2004/03/15 17:54:46
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Small fix for compiler warning

2004-03-15  Dalibor Topic <robilad at kaffe.org>

        * libraries/clib/awt/X/fnt.c:
        Define variables only used without I18N support
        only when I18N support is turned off.

Members: 
	ChangeLog:1.2100->1.2101 
	libraries/clib/awt/X/fnt.c:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2100 kaffe/ChangeLog:1.2101
--- kaffe/ChangeLog:1.2100	Mon Mar 15 17:37:02 2004
+++ kaffe/ChangeLog	Mon Mar 15 17:54:46 2004
@@ -1,5 +1,11 @@
 2004-03-15  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/clib/awt/X/fnt.c:
+	Define variables only used without I18N support
+	only when I18N support is turned off.
+
+2004-03-15  Dalibor Topic <robilad at kaffe.org>
+
 	* config/m68k/clear-cache.h:
 	Removed.
 
Index: kaffe/libraries/clib/awt/X/fnt.c
diff -u kaffe/libraries/clib/awt/X/fnt.c:1.12 kaffe/libraries/clib/awt/X/fnt.c:1.13
--- kaffe/libraries/clib/awt/X/fnt.c:1.12	Fri Mar  5 17:12:35 2004
+++ kaffe/libraries/clib/awt/X/fnt.c	Mon Mar 15 17:54:47 2004
@@ -338,7 +338,6 @@
 Java_java_awt_Toolkit_fntGetWidths ( JNIEnv* env, jclass clazz, XFontStruct* fs )
 #endif	
 {
-  int       n = 256;
   jintArray widths;
   jint      *jw;
   jboolean isCopy;
@@ -350,6 +349,7 @@
   int num;
 #else  
   register  int i, j;
+  const int n = 256;
 #endif  
 
   widths = (*env)->NewIntArray( env, 256);
@@ -396,12 +396,13 @@
   jboolean  isCopy;
   jbyte    *jb = (*env)->GetByteArrayElements( env, jBytes, &isCopy);
   int       n = (*env)->GetArrayLength( env, jBytes);
-  int       w;
 #ifdef KAFFE_I18N
   wchar_t   *wch;
   XRectangle *ink_array, *logical_array;
   XRectangle overall_ink, overall_logical;
   int num;
+#else
+  int       w;
 #endif
 
   if ( off+len > n ) len = n - off;




More information about the kaffe mailing list