Index: lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp
+++ lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp
@@ -1092,7 +1092,7 @@
             }
         }
     }
-    return 0;
+    return LLDB_INVALID_INDEX32;
 }
 
 bool
@@ -1221,7 +1221,7 @@
     int index = GetVacantWatchIndex (&regs, addr, size, watch_flags, NumSupportedHardwareWatchpoints());
 
     // New watchpoint doesn't fit
-    if (!index)
+    if (index == LLDB_INVALID_INDEX32)
     return LLDB_INVALID_INDEX32;