A define dealing with builtin type is wrong. A gnulib update fixes this, but that requires a new cpio version. Refresh other patch. Signed-off-by: Rosen Penev <rosenp@gmail.com>