Merge branch 'maint' to sync with 1.6.0.1

diff --git a/Makefile b/Makefile
index 5e944d8a161851a360a9bc61503b1ef11ee00af1..e5a4985a1d9d212d5458356f21fc133db6fe23ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -735,6 +735,7 @@ ifeq ($(uname_S),HP-UX)
        NO_UNSETENV = YesPlease
        NO_HSTRERROR = YesPlease
        NO_SYS_SELECT_H = YesPlease
+       SNPRINTF_RETURNS_BOGUS = YesPlease
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
        NO_MMAP = YesPlease