It seems a define is needed to get these platforms to have the same formats. Upstream backport. Signed-off-by: Rosen Penev <rosenp@gmail.com>