2002-04-30 Michael Snyder <msnyder@redhat.com>

	* gnu-nat.c (gnu_find_memory_regions): Fix merge botch.

diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index de4662a7f8e3e641f369cfcdb0fcf3fe602a0b44..a4b8020a04c43eff630d2ed122457101f85168cd 100644 (file)
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2536,6 +2536,7 @@ gnu_find_memory_regions (int (*func) (CORE_ADDR,
          last_protection = protection;
        }
     }
+
   /* Report the final region.  */
   if (last_region_end > last_region_address && last_protection != VM_PROT_NONE)
     (*func) (last_region_address, last_region_end - last_region_address,
@@ -2543,6 +2544,8 @@ gnu_find_memory_regions (int (*func) (CORE_ADDR,
             last_protection & VM_PROT_WRITE,
             last_protection & VM_PROT_EXECUTE,
             data);
+
+  return 0;
 }
 
 \f