Merge pull request #3321
0078841 prevent Windows redefinition warning cause by compat.h (Philip Kaufmann)