From 3b46cf38cdd8009ec7ee5e5dc19060de59b5be91 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sun, 31 Oct 2004 00:57:25 +0000
Subject: [PATCH] fixed some compilation issues with gcc-2.9x

---
 ChangeLog    | 2 ++
 configure.ac | 2 +-
 src/menu.c   | 3 +++
 src/wmspec.c | 7 +++----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 268138aa..57e7fbac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ Changes since version 0.91.0:
 - allow disable of switch panel when SwitchPanelImages=None
 - added X Input Methods support in WINGs
 - fixed issues with compiling on Solaris with openwin
+- reduced minimum required version number for the Xft library to 2.1.0
+- fixed some compilation issues with gcc-2.9x
 
 
 Changes since version 0.90.0:
diff --git a/configure.ac b/configure.ac
index d767e1aa..4df05663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,7 +535,7 @@ else
         exit 1
 fi
 
-minXFT="2.1.2"
+minXFT="2.1.0"
 goodxft="no"
 
 dnl
diff --git a/src/menu.c b/src/menu.c
index bb37dad6..a1a8bf2c 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1074,6 +1074,9 @@ keyboardMenu(WMenu *menu)
                 break;
 
             case XK_Return:
+#ifdef XK_KP_Enter
+            case XK_KP_Enter:
+#endif
                 done = 2;
                 break;
 
diff --git a/src/wmspec.c b/src/wmspec.c
index a3520cf0..777f1cb0 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -383,17 +383,16 @@ updateIconImage(WScreen *scr, WWindow *wwin)
 
     if (rc==Success && prop_return) {
         unsigned int *data = (unsigned int *)prop_return;
-        unsigned int pos = 0, len = 0;
-        unsigned int best_pos = 0, best_tmp = ~0;
-        extern WPreferences wPreferences;
+        unsigned int pos = 0, len = 0, best_pos = 0, best_tmp = ~0;
         unsigned int pref_size = wPreferences.icon_size;
         unsigned int pref_sq = pref_size*pref_size;
+        unsigned int tmp;
         char *src, *dst;
         RImage *new_rimage;
 
         do {
             len = data[pos+0]*data[pos+1];
-            unsigned int tmp = pref_sq-len;
+            tmp = pref_sq-len;
             if (tmp < best_tmp && tmp > 0) {
                 best_tmp = tmp;
                 best_pos = pos;
-- 
2.11.4.GIT