Fix gdb.fortran/array-element.exp failures.

[deliverable/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 0040bbd31f2946f57bd38b717048970b9a7af58f..9a43cf371bc8bb65f6335ccbb885d5bc95de4292 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -21,7 +21,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
@@ -34,7 +33,6 @@
 #include "command.h"
 #include "block.h"
 #include "dictionary.h"
-#include "gdb_assert.h"
 #include "exceptions.h"
 
 extern void _initialize_f_valprint (void);
@@ -351,7 +349,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
          opts.format = (options->format ? options->format
                         : options->output_format);
          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                     original_value, options, 0, stream);
+                                     original_value, &opts, 0, stream);
        }
       else
        {
@@ -424,7 +422,7 @@ info_common_command_for_block (const struct block *block, const char *comname,
   ALL_BLOCK_SYMBOLS (block, iter, sym)
     if (SYMBOL_DOMAIN (sym) == COMMON_BLOCK_DOMAIN)
       {
-       struct common_block *common = SYMBOL_VALUE_COMMON_BLOCK (sym);
+       const struct common_block *common = SYMBOL_VALUE_COMMON_BLOCK (sym);
        size_t index;
 
        gdb_assert (SYMBOL_CLASS (sym) == LOC_COMMON_BLOCK);