* jv-exp.y (insert_exp): Define using ISO syntax.

[deliverable/binutils-gdb.git] / gdb / scm-exp.c

diff --git a/gdb/scm-exp.c b/gdb/scm-exp.c
index 7464ecfc6bf5d921f658a1e72355361746fe7d41..f4aa36967ca706fae1872edb1ebfb2a4cde14239 100644 (file)
--- a/gdb/scm-exp.c
+++ b/gdb/scm-exp.c
@@ -1,11 +1,13 @@
 /* Scheme/Guile language support routines for GDB, the GNU debugger.
-   Copyright 1995, 1996, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1995, 1996, 2000, 2003, 2005, 2008
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "symtab.h"
@@ -237,7 +237,7 @@ scm_read_token (int c, int weird)
 static int
 scm_skip_ws (void)
 {
-  register int c;
+  int c;
   while (1)
     switch ((c = *lexptr++))
       {
@@ -309,10 +309,10 @@ tryagain:
       if (!skipping)
        {
          struct value *val = scm_evaluate_string (str.ptr, lexptr - str.ptr);
-         if (!is_scmvalue_type (VALUE_TYPE (val)))
+         if (!is_scmvalue_type (value_type (val)))
            error ("quoted scm form yields non-SCM value");
-         svalue = extract_signed_integer (VALUE_CONTENTS (val),
-                                          TYPE_LENGTH (VALUE_TYPE (val)));
+         svalue = extract_signed_integer (value_contents (val),
+                                          TYPE_LENGTH (value_type (val)));
          goto handle_immediate;
        }
       return;