am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.

* commit 'a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c':
  Fix windows-specific error without messing up Makefile flags.