gcc cleanup to be consistent with recent changes
Merge branch 'master' of github.com:/fasrc/fasrcsw