[Zlib-devel] Second zlib 1.2.4 candidate

[Cosmin Truta]

Hello, Mark,

I forgot to include the actual patches.
The renaming of _MSV_VER to _MSC_VER isn't tested, because I don't
have WinCE, but I think it looks safe enough to do it.

Best regards,
Cosmin


--- gzguts.h~   2010-01-26 00:36:04.000000000 -0500
+++ gzguts.h    2010-03-14 11:17:20.000000000 -0400
@@ -29,6 +29,9 @@

 #ifdef WIN32
 #  include <io.h>
+#endif
+
+#ifdef _MSC_VER
 #  define vsnprintf _vsnprintf
 #endif
--- zutil.h~    2010-01-09 15:10:14.000000000 -0500
+++ zutil.h     2010-03-14 11:22:08.000000000 -0400
@@ -17,7 +17,7 @@
 #include "zlib.h"

 #ifdef STDC
-#  if !(defined(_WIN32_WCE) && defined(_MSV_VER))
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 #    include <stddef.h>
 #  endif
 #  include <string.h>


On Sun, Mar 14, 2010 at 10:20 AM, Cosmin Truta wrote:
> ...
> Another thing, not necessarily a stop-ship, but a good thing to do in
> case this gets another revision:
> In gzguts.h at line 32, the substitution vsnprintf --> _vsnprintf
> should only be done under _MSC_VER, because that one isn't fully ISO C
> compatible. So replace #ifdef WIN32 with #if defined(_MSC_VER).
>
> **
>
> One last thing: the occurence of _MSV_VER in zutil.h is a typo, isn't it?
> _MSV_VER --> _MSC_VER