Tom Tromey wrote:
>>>>>> "Michael" == Michael Snyder <msnyder@vmware.com> writes:
> 
> Michael>  static int
> Michael> -watchpoint_check (void *p)
> Michael> +watchpoint_check_1 (void *p, struct value **new_valp)
> 
> I think the first argument should be of type struct breakpoint *.
> All the calls to this function seem to pass in a breakpoint, and AFAICT
> there is nothing requiring this code not to use the proper type.

Actually, the call from watchpoint_check_2 passes a void pointer,
but that does not preclude your suggestion.  How's this?