Fix compile errors on Ubuntu 13.10 (gcc 4.8.1-10ubuntu8)

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>