Merge pull request #462 from bk138/gcc-workaround-sys-sdt-h-detection