Regenerated after Reid's change for uint64_t/u_int64_t (patch by Bill Wendling)