--- ../zlib-1.2.3-orig/zlib.h	Sun Jul 17 21:26:49 2005
+++ zlib.h	Wed May 03 13:48:04 2006
@@ -37,8 +37,20 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
+#define ZLIB_VERNUM_MAJOR  1
+#define ZLIB_VERNUM_MINOR  2
+#define ZLIB_VERNUM_MAINT  3
+
+#define ZLIB_STRINGIZE_VAL(val) #val
+#define ZLIB_STRINGIZE_TOK(tok) ZLIB_STRINGIZE_VAL( tok )
+
+#define ZLIB_VERSION ZLIB_STRINGIZE_TOK( ZLIB_VERNUM_MAJOR ) \
+                 "." ZLIB_STRINGIZE_TOK( ZLIB_VERNUM_MINOR ) \
+                 "." ZLIB_STRINGIZE_TOK( ZLIB_VERNUM_MAINT ) 
+
+#define ZLIB_VERNUM ( ZLIB_VERNUM_MAJOR << 12 \
+                    | ZLIB_VERNUM_MINOR <<  8 \
+                    | ZLIB_VERNUM_MAINT <<  4 )
 
 /*
      The 'zlib' compression library provides in-memory compression and
--- ../zlib-1.2.3-orig/win32/zlib1.rc	Sun Jul 17 21:35:36 2005
+++ win32/zlib1.rc	Wed May 03 13:50:32 2006
@@ -1,19 +1,20 @@
-#include <windows.h>
+#include <winver.h>
+#include "zlib.h"
 
 #ifdef GCC_WINDRES
 VS_VERSION_INFO		VERSIONINFO
 #else
 VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION		1,2,2,0
-  PRODUCTVERSION	1,2,2,0
+  FILEVERSION		ZLIB_VERNUM_MAJOR,ZLIB_VERNUM_MINOR,ZLIB_VERNUM_MAINT,0
+  PRODUCTVERSION	ZLIB_VERNUM_MAJOR,ZLIB_VERNUM_MINOR,ZLIB_VERNUM_MAINT,0
   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS		1
 #else
   FILEFLAGS		0
 #endif
-  FILEOS		VOS_DOS_WINDOWS32
+  FILEOS		VOS__WINDOWS32
   FILETYPE		VFT_DLL
   FILESUBTYPE		0	// not used
 BEGIN
@@ -23,13 +24,13 @@
     //language ID = U.S. English, char set = Windows, Multilingual
     BEGIN
       VALUE "FileDescription",	"zlib data compression library\0"
-      VALUE "FileVersion",	"1.2.3\0"
+      VALUE "FileVersion",	ZLIB_VERSION "\0"
       VALUE "InternalName",	"zlib1.dll\0"
       VALUE "LegalCopyright",	"(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename",	"zlib1.dll\0"
       VALUE "ProductName",	"zlib\0"
-      VALUE "ProductVersion",	"1.2.3\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+      VALUE "ProductVersion",	ZLIB_VERSION "\0"
+      VALUE "Comments",         "License published at http://www.zlib.net/zlib_license.html\0"
     END
   END
   BLOCK "VarFileInfo"