diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a2b4b5826a..c8ccab5a3d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-17  Andrew Cagney  <cagney@redhat.com>
+
+	* mdebugread.c (compare_blocks): Make addr_diff a LONGEST.
+	* block.h: Make GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOOCK
+	enums.
+
 2004-01-17  Daniel Jacobowitz  <drow@mvista.com>
 
 	* remote.c: Update copyright years.
diff --git a/gdb/block.h b/gdb/block.h
index 38d037e022..a36821305c 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -139,9 +139,7 @@ struct blockvector
 
 /* Special block numbers */
 
-#define GLOBAL_BLOCK		0
-#define	STATIC_BLOCK		1
-#define	FIRST_LOCAL_BLOCK	2
+enum { GLOBAL_BLOCK = 0, STATIC_BLOCK = 1, FIRST_LOCAL_BLOCK = 2 };
 
 extern struct symbol *block_function (const struct block *);
 
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 71474a9c48..ae1ea7d6cd 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -4509,7 +4509,7 @@ add_line (struct linetable *lt, int lineno, CORE_ADDR adr, int last)
 static int
 compare_blocks (const void *arg1, const void *arg2)
 {
-  int addr_diff;
+  LONGEST addr_diff;
   struct block **b1 = (struct block **) arg1;
   struct block **b2 = (struct block **) arg2;