mktime: merge another wrapv change from gnulib