Don't emit symbols seen only in dynamic object, don't read duplicate

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

diff --git a/gdb/scm-exp.c b/gdb/scm-exp.c
index 14aeabd1a45f1c414ce56d8cb78974ff85d3662f..61eb7c4b73998995f6ebfd6d7f0d19a88d671d17 100644 (file)
--- a/gdb/scm-exp.c
+++ b/gdb/scm-exp.c
@@ -1,5 +1,7 @@
 /* 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 Free Software Foundation,
+   Inc.
 
    This file is part of GDB.
 
@@ -15,8 +17,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "symtab.h"
@@ -237,7 +239,7 @@ scm_read_token (int c, int weird)
 static int
 scm_skip_ws (void)
 {
-  register int c;
+  int c;
   while (1)
     switch ((c = *lexptr++))
       {
@@ -308,11 +310,11 @@ tryagain:
       scm_lreadr (skipping);
       if (!skipping)
        {
-         value_ptr val = scm_evaluate_string (str.ptr, lexptr - str.ptr);
-         if (!is_scmvalue_type (VALUE_TYPE (val)))
+         struct value *val = scm_evaluate_string (str.ptr, lexptr - str.ptr);
+         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;