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

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