gdb/

	* cp-name-parser.y (xfree): Wrap the name free by CONCAT2.
	(main): Uncomment "Demangling error\n".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4215c45c74a9752c29010c320e0523087e7619bf..bfc049aebab409d2754f3b884693682fa9cebaf4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * cp-name-parser.y (xfree): Wrap the name free by CONCAT2.
+       (main): Uncomment "Demangling error\n".
+
 2011-08-05  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        * solib-target.c (segment_attributes): Make them static.

diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 87367779a0e3615104867be650d0f74dbc554b85..286bbb46c8e22b05a6513490a4be8035b52471b5 100644 (file)
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -2042,7 +2042,10 @@ void
 xfree (void *ptr)
 {
   if (ptr != NULL)
-    free (ptr);
+    {
+      /* Literal `free' would get translated back to xfree again.  */
+      CONCAT2 (fr,ee) (ptr);
+    }
 }
 
 int
@@ -2071,7 +2074,7 @@ main (int argc, char **argv)
        str2 = cplus_demangle (buf, DMGL_PARAMS | DMGL_ANSI | DMGL_VERBOSE);
        if (str2 == NULL)
          {
-           /* printf ("Demangling error\n"); */
+           printf ("Demangling error\n");
            if (c)
              printf ("%s%c%s\n", buf, c, extra_chars);
            else