X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d98a58c543948d84d9287e6fa53a5539d662b7a5..f363cee882672e147340240cf0bb194a68e37833:/src/common/zstream.cpp?ds=sidebyside diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 031dbb29e8..e10e3d774e 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -4,7 +4,6 @@ // Author: Guilhem Lavaux // Modified by: Mike Wetherell // Created: 11/07/98 -// RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,10 +46,18 @@ enum { wxVersionInfo wxGetZlibVersionInfo() { - return wxVersionInfo("zlib", - ZLIB_VERNUM >> 12, - (ZLIB_VERNUM >> 8) & 0x0F, - (ZLIB_VERNUM & 0xFF) / 0x10); + int major, + minor, + build; + + if ( sscanf(zlibVersion(), "%d.%d.%d", &major, &minor, &build) != 3 ) + { + major = + minor = + build = 0; + } + + return wxVersionInfo("zlib", major, minor, build); } /////////////////////////////////////////////////////////////////////////////