Original version looks fine to me, but fails to compile with e.g.
gcc versions Ubuntu 4.4.3-4ubuntu5 and Debian 4.4.4-6.

Reviewed-by: Kai Koehne
Reviewed-by: kh1