* symtab.h (GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOCK): New

        defines for the blocks of a blockvector that contain global and
        file-static symbols and the first of the smaller scope contours.

diff --git a/gdb/expread.y b/gdb/expread.y
index acced91a60be56c28a443817bee3802fba7c9d19..b59d4ec6058a21a35dc0fea4307abc3a5f373e3c 100755 (executable)
--- a/gdb/expread.y
+++ b/gdb/expread.y
@@ -529,7 +529,8 @@ block       :       BLOCKNAME
                              struct symtab *tem =
                                  lookup_symtab (copy_name ($1.stoken));
                              if (tem)
-                               $$ = BLOCKVECTOR_BLOCK (BLOCKVECTOR (tem), 1);
+                               $$ = BLOCKVECTOR_BLOCK
+                                        (BLOCKVECTOR (tem), STATIC_BLOCK);
                              else
                                error ("No file or function \"%s\".",
                                       copy_name ($1.stoken));

diff --git a/gdb/symtab.h b/gdb/symtab.h
index e63c8795a98f9a51651e8eb5d55dcb31991fe3ad..0421357ec7cd3e9e9f1ce3197741485c07b2f60c 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -317,6 +317,11 @@ struct blockvector
   struct block *block[1];
 };
 
+/* Special block numbers */
+#define GLOBAL_BLOCK   0
+#define        STATIC_BLOCK    1
+#define        FIRST_LOCAL_BLOCK       2
+
 struct block
 {
   /* Addresses in the executable code that are in this block.