Merge branch 'master' into mk/rename

diff --git a/Makefile b/Makefile
index dc39f72f1eb8b3a05c03ffe16e62b056924cf573..733fa660d9032fee8f7ad32fffa9803a113b11af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -334,9 +334,9 @@ ifeq ($(uname_O),Cygwin)
        NO_D_TYPE_IN_DIRENT = YesPlease
        NO_D_INO_IN_DIRENT = YesPlease
        NO_STRCASESTR = YesPlease
-       NO_STRLCPY = YesPlease
        NO_SYMLINK_HEAD = YesPlease
        NEEDS_LIBICONV = YesPlease
+       NO_C99_FORMAT = YesPlease
        # There are conflicting reports about this.
        # On some boxes NO_MMAP is needed, and not so elsewhere.
        # Try uncommenting this if you see things break -- YMMV.