2012-12-11 Pedro Alves <pedro@codesourcery.com>

[binutils-gdb.git] / gdb / printcmd.c

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 7a669f125e0b57d4634e54135118eb067aafb93d..25b14e1ccb86a877092e2da46ba1c590d45c37b5 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -145,7 +145,7 @@ struct display
     struct program_space *pspace;
 
     /* Innermost block required by this expression when evaluated.  */
-    struct block *block;
+    const struct block *block;
 
     /* Status of this display (enabled or disabled).  */
     int enabled_p;
@@ -2221,7 +2221,7 @@ ui_printf (char *arg, struct ui_file *stream)
            error (_("long double not supported in printf"));
 #endif
          case long_long_arg:
-#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
+#ifdef PRINTF_HAS_LONG_LONG
            {
              long long val = value_as_long (val_args[i]);
 
@@ -2356,7 +2356,7 @@ ui_printf (char *arg, struct ui_file *stream)
                 handle %p as glibc would: %#x or a literal "(nil)".  */
 
              char *p, *fmt, *fmt_p;
-#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
+#ifdef PRINTF_HAS_LONG_LONG
              long long val = value_as_long (val_args[i]);
 #else
              long val = value_as_long (val_args[i]);
@@ -2391,7 +2391,7 @@ ui_printf (char *arg, struct ui_file *stream)
              gdb_assert (*p == 'p' && *(p + 1) == '\0');
              if (val != 0)
                {
-#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
+#ifdef PRINTF_HAS_LONG_LONG
                  *fmt_p++ = 'l';
 #endif
                  *fmt_p++ = 'l';