diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f11eed50b..f534d3e06a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-12  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* go32-nat.c (go32_insert_hw_breakpoint): When there are no more
+	hardware breakpoint resources, return EBUSY.
+	(go32_handle_nonaligned_watchpoint): If the argument WHAT is not
+	one of the enumerated values, return EINVAL.
+
 2000-04-12  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* README: Mention special build instructions for DJGPP.
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index c839d11b6d..6668f06e4e 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -879,7 +879,7 @@ go32_handle_nonaligned_watchpoint (wp_op what, CORE_ADDR waddr, CORE_ADDR addr,
       else if (what == wp_count)
 	rv++;
       else
-	status = -1;
+	status = EINVAL;
       /* We keep the loop going even after a failure, because some of
 	 the other aligned watchpoints might still succeed, e.g. if
 	 they watch addresses that are already watched, and thus just
@@ -1055,7 +1055,7 @@ go32_insert_hw_breakpoint (CORE_ADDR addr, void *shadow ATTRIBUTE_UNUSED)
     }
   SHOW_DR (insert_hw, 0);
 
-  return i < 4 ? 0 : -1;
+  return i < 4 ? 0 : EBUSY;
 }
 
 /* Put the device open on handle FD into either raw or cooked