fix #if/ifdef issue and use u_int16_t instead of int where appropriate
fix #if/ifdef issue and use u_int16_t instead of int where appropriate

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars