*** empty log message ***

diff --git a/Changes b/Changes
index 19c7590e58866785436033bdf5c63c2c23592eda..c17d5a19f6f3257aed059782b294e4813ce24e31 100644 (file)
--- 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 d7576f40d85e0acf1415ffe6d13be139bce91b2e..21062b177df1bb71456afc08b50b77ab7a76a81a 100644 (file)
--- 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 2fa28a94848036904a9964d49bdf67e96a19ebb5..784d097d892a510f0ca95c51b29c78555aaee201 100644 (file)
--- 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;
 }
 
 /*