From 4100a5d2f15a6ad857fc7c560e650b0b6212de94 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sat, 30 May 2009 06:56:20 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes       | 4 +++-
 src/command.C | 2 +-
 src/misc.C    | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changes b/Changes
index 19c7590e..c17d5a19 100644
--- a/Changes
+++ b/Changes
@@ -24,7 +24,9 @@ TODO: exg-- patch
 TODO: selection_beg/end should set screen, or so
 TODO:        - upgrade to libev-xx
 TODO: -rv interacts badly with popups.
-TODO:	- gcc-4.4/const/Milos Jakubicek.
+TODO: -letterspace option
+	- port to glibc-2.10 changes (strchr etc. returning const char *
+          in C++), based on patches by Milos Jakubicek and Oliver Mader.
         - the binary search algorithm to find precomposed characters
           was faulty, skipping some possible combinations (found by
           Mikachu).
diff --git a/src/command.C b/src/command.C
index d7576f40..21062b17 100644
--- a/src/command.C
+++ b/src/command.C
@@ -3338,7 +3338,7 @@ rxvt_term::process_xterm_seq (int op, char *str, char resp)
           }
         else
           {
-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
+            char *eq = strchr (str, '=');
 
             if (eq)
               {
diff --git a/src/misc.C b/src/misc.C
index 2fa28a94..784d097d 100644
--- a/src/misc.C
+++ b/src/misc.C
@@ -170,9 +170,9 @@ rxvt_utf8towcs (const char *str, int len)
 const char *
 rxvt_basename (const char *str) NOTHROW
 {
-  char *base = strrchr (str, '/');
+  const char *base = strrchr (str, '/');
 
-  return (char *) (base ? base + 1 : str);
+  return base ? base + 1 : str;
 }
 
 /*
-- 
2.34.1