* lin-lwp.c (stop_wait_callback): Remove bogus assertions in the

[deliverable/binutils-gdb.git] / gdb / symtab.h

diff --git a/gdb/symtab.h b/gdb/symtab.h
index 334d266a9f08aa4e6e7e24eb4f139608ae81d1b1..55db0f82a9d486086e058bf9a0798b6b9dea789a 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -829,7 +829,9 @@ struct section_offsets
     CORE_ADDR offsets[1];      /* As many as needed. */
   };
 
-#define        ANOFFSET(secoff, whichone)      (secoff->offsets[whichone])
+#define        ANOFFSET(secoff, whichone) \
+   ((whichone == -1) ? \
+    (internal_error ("Section index is uninitialized"), -1) : secoff->offsets[whichone])
 
 /* The maximum possible size of a section_offsets table.  */
 
@@ -1011,7 +1013,7 @@ struct partial_symtab
     /* Pointer to function which will read in the symtab corresponding to
        this psymtab.  */
 
-    void (*read_symtab) PARAMS ((struct partial_symtab *));
+    void (*read_symtab) (struct partial_symtab *);
 
     /* Information that lets read_symtab() locate the part of the symbol table
        that this psymtab corresponds to.  This information is private to the
@@ -1059,10 +1061,11 @@ struct partial_symtab
    style, using thunks (where '$' is really CPLUS_MARKER). */
 
 #define VTBL_PREFIX_P(NAME) \
-  ((NAME)[0] == '_' \
+  (((NAME)[0] == '_' \
    && (((NAME)[1] == 'V' && (NAME)[2] == 'T') \
        || ((NAME)[1] == 'v' && (NAME)[2] == 't')) \
-   && is_cplus_marker ((NAME)[3]))
+   && is_cplus_marker ((NAME)[3])) || ((NAME)[0]=='_' && (NAME)[1]=='_' \
+   && (NAME)[2]=='v' && (NAME)[3]=='t' && (NAME)[4]=='_'))
 
 /* Macro that yields non-zero value iff NAME is the prefix for C++ destructor
    names.  Note that this macro is g++ specific (FIXME).  */
@@ -1413,6 +1416,10 @@ extern int in_prologue (CORE_ADDR pc, CORE_ADDR func_start);
 extern struct symbol *fixup_symbol_section (struct symbol *,
                                            struct objfile *);
 
+extern struct partial_symbol *fixup_psymbol_section (struct partial_symbol
+                                                    *psym,
+                                                    struct objfile *objfile);
+
 /* Symbol searching */
 
 /* When using search_symbols, a list of the following structs is returned.
@@ -1441,5 +1448,6 @@ struct symbol_search
 extern void search_symbols (char *, namespace_enum, int, char **,
                            struct symbol_search **);
 extern void free_search_symbols (struct symbol_search *);
+extern struct cleanup *make_cleanup_free_search_symbols (struct symbol_search *);
 
 #endif /* !defined(SYMTAB_H) */