More build failure - malloc fallout

[Paul Goyette <paul%whooppee.com@localhost>]

After reverting make(1) to yesterday's revisions, I got quite a bit 
further into a 'build.sh release' until reaching this (on port amd64):

--- dependall-librump ---
/build/netbsd-local/src/lib/librump/../../sys/rump/librump/rumpkern/emul.c:323:
error: conflicting types for '__wrap_malloc'
/build/netbsd-local/src/lib/librump/../../sys/rump/../sys/malloc.h:105: 
error: previous declaration of '__wrap_malloc' was here
*** [emul.po] Error code 1


----------------------------------------------------------------------
|   Paul Goyette   | PGP DSS Key fingerprint: |  E-mail addresses:   |
| Customer Service | FA29 0E3B 35AF E8AE 6651 |  paul%whooppee.com@localhost   |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette%juniper.net@localhost |
|                  |                          | pgoyette%netbsd.org@localhost  |
----------------------------------------------------------------------