# HG changeset patch
# User james
# Date 1148488232 0
# Node ID ac11131c6de960b5c40dad865f56eff57a565ee6
# Parent  ebbc8ddcaf3242d42538071ee2ada3c70a6b9b88
[xemacs-hg @ 2006-05-24 16:30:28 by james]
Don't use C99/C++ variable declaration style.  <86zmhiax0m.fsf@santinel.home.ua>

diff -r ebbc8ddcaf32 -r ac11131c6de9 src/ChangeLog
--- a/src/ChangeLog	Tue May 23 21:51:35 2006 +0000
+++ b/src/ChangeLog	Wed May 24 16:30:32 2006 +0000
@@ -1,3 +1,7 @@
+2006-05-16  Andrey Slusar  <anrays@gmail.com>
+
+	* objects-x.c (x_find_charset_font): Fix build with gcc 2.95.
+
 2006-05-23  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* file-coding.c (output_bytes_in_ascii_and_hex):
diff -r ebbc8ddcaf32 -r ac11131c6de9 src/objects-x.c
--- a/src/objects-x.c	Tue May 23 21:51:35 2006 +0000
+++ b/src/objects-x.c	Wed May 24 16:30:32 2006 +0000
@@ -1215,6 +1215,7 @@
     stderr_out ("Failed fontconfig initialization\n");
   else
     {
+      struct charset_reporter *cr;
       FcPattern *fontxft;	/* long-lived, freed at end of this block */
       FcResult fcresult;
       FcConfig *fcc;
@@ -1302,7 +1303,6 @@
 	 Optimization:  cache the generated FcCharSet in the Mule charset.
          Don't forget to destroy it if the Mule charset gets deallocated. */
 
-      struct charset_reporter *cr;
       for (cr = charset_table;
 	   cr->charset && !EQ (*(cr->charset), charset);
 	   cr++)