[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1567] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1567
          http://sourceforge.net/p/opengtoolkit/svn/1567
Author:   labviewer
Date:     2018-12-12 11:22:02 +0000 (Wed, 12 Dec 2018)
Log Message:
-----------
minor edit for MSC 6

Modified Paths:
--------------
    trunk/lvzip/c_source/zlib.h
    trunk/lvzip/c_source/zlibvc.dsp

Modified: trunk/lvzip/c_source/zlib.h
===================================================================
--- trunk/lvzip/c_source/zlib.h	2018-12-12 11:01:51 UTC (rev 1566)
+++ trunk/lvzip/c_source/zlib.h	2018-12-12 11:22:02 UTC (rev 1567)
@@ -1780,21 +1780,6 @@
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-//#ifdef Z_PREFIX_SET
-//#  define lvzip_deflateInit(strm, level) \
-//          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-//#  define lvzip_inflateInit(strm) \
-//          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-//#  define lvzip_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-//          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-//                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-//#  define lvzip_inflateInit2(strm, windowBits) \
-//          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-//                        (int)sizeof(z_stream))
-//#  define lvzip_inflateBackInit(strm, windowBits, window) \
-//          inflateBackInit_((strm), (windowBits), (window), \
-//                           ZLIB_VERSION, (int)sizeof(z_stream))
-//#else
 #  define deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define inflateInit(strm) \
@@ -1808,7 +1793,6 @@
 #  define inflateBackInit(strm, windowBits, window) \
           inflateBackInit_((strm), (windowBits), (window), \
                            ZLIB_VERSION, (int)sizeof(z_stream))
-//#endif
 
 #ifndef Z_SOLO
 

Modified: trunk/lvzip/c_source/zlibvc.dsp
===================================================================
--- trunk/lvzip/c_source/zlibvc.dsp	2018-12-12 11:01:51 UTC (rev 1566)
+++ trunk/lvzip/c_source/zlibvc.dsp	2018-12-12 11:22:02 UTC (rev 1567)
@@ -50,7 +50,7 @@
 LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "bzip2" /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "ZLIB_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "bzip2" /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -63,7 +63,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386
-# ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"Win32_DLL_Release\lvzlib.dll"
+# ADD LINK32 advapi32.lib user32.lib kernel32.lib ole32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"Win32_DLL_Release\lvzlib.dll"
 
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL Debug"
 
@@ -82,7 +82,7 @@
 LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /FD /c
-# ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "ZLIB_DLL" /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /ZI /Od /I "bzip2" /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /FR /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -95,7 +95,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"Win32_DLL_Debug\lvzlib.dll"
+# ADD LINK32 advapi32.lib user32.lib kernel32.lib ole32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"Win32_DLL_Debug\lvzlib.dll"
 # SUBTRACT LINK32 /incremental:no
 
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL Embedded"
@@ -115,7 +115,7 @@
 LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "EMBEDDED" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "bzip2" /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_BZIP2" /D "HAVE_AES" /D "EMBEDDED" /D "ZLIB_DLL" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "bzip2" /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "EMBEDDED" /FR /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.