* 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.

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));

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.