Add some more macros for compatibility support
Merge branch 'iter' of github.com:tjguk/scandir into iter