Fix violations to C89

Change-Id: I7f08ae85676ff6944c4acd7b90b05731426dc3f7
Reviewed-on: http://review.couchbase.org/30181
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>