[opengtoolkit-cvs] lvzip/c_source zlib.h, 1.4, 1.5 zlibvc.def, 1.17, 1.18 zlibvc.dsp, 1.15, 1.16

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/opengtoolkit/lvzip/c_source
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20257/c_source

Modified Files:
	zlib.h zlibvc.def zlibvc.dsp 
Log Message:
Rename all symbols in the library by prepending lvzip_ to them to avoid name conflicts with already defined functions in the cRIO VxWorks kernel.

Index: zlib.h
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zlib.h	7 Jan 2006 20:06:23 -0000	1.4
--- zlib.h	23 Dec 2008 07:50:32 -0000	1.5
***************
*** 33,36 ****
--- 33,37 ----
  
  #include "zconf.h"
+ #include "zalias.h"
  
  #ifdef __cplusplus

Index: zlibvc.def
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.def,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** zlibvc.def	27 Feb 2008 20:00:21 -0000	1.17
--- zlibvc.def	23 Dec 2008 07:50:32 -0000	1.18
***************
*** 19,62 ****
      LVPath_DecodeMacbinary
  
!     adler32
!     compress
!     crc32
!     deflate
!     inflate
!     uncompress
!     zlibVersion
!     compress2
  
!     unzOpen
!     unzClose
!     unzGetGlobalInfo
!     unzGetCurrentFileInfo
!     unzGoToFirstFile
!     unzGoToNextFile
!     unzOpenCurrentFile
!     unzReadCurrentFile
!     unzOpenCurrentFile3
!     unztell
!     unzeof
!     unzCloseCurrentFile
!     unzGetGlobalComment
!     unzStringFileNameCompare
!     unzLocateFile
!     unzGetLocalExtrafield
!     unzOpen2
!     unzOpenCurrentFile2
!     unzOpenCurrentFilePassword
!     unzGetFilePos
!     unzGoToFilePos
!     unzRepair
  
!     zipOpen
!     zipOpenNewFileInZip
!     zipWriteInFileInZip
!     zipCloseFileInZip
!     zipClose
!     zipOpenNewFileInZip2
!     zipCloseFileInZipRaw
!     zipOpen2
!     zipOpenNewFileInZip3
!     zipClose2
\ No newline at end of file
--- 19,63 ----
      LVPath_DecodeMacbinary
  
!     lvzip_adler32
!     lvzip_compress
! 	lvzip_compress2
!     lvzip_crc32
!     lvzip_deflate
!     lvzip_inflate
!     lvzip_uncompress
!     lvzip_zlibVersion
  
!     lvzip_unzClose
!     lvzip_unzCloseCurrentFile
!     lvzip_unzGetCurrentFileInfo
!     lvzip_unzGetFilePos
! 	lvzip_unzGetGlobalComment
!     lvzip_unzGetGlobalInfo
!     lvzip_unzGetLocalExtrafield
!     lvzip_unzGoToFilePos
!     lvzip_unzGoToFirstFile
!     lvzip_unzGoToNextFile
!     lvzip_unzLocateFile
!     lvzip_unzOpen
!     lvzip_unzOpen2
!     lvzip_unzOpenCurrentFile
!     lvzip_unzOpenCurrentFile2
!     lvzip_unzOpenCurrentFile3
!     lvzip_unzOpenCurrentFilePassword
!     lvzip_unzReadCurrentFile
!     lvzip_unzRepair
!     lvzip_unzStringFileNameCompare
!     lvzip_unztell
!     lvzip_unzeof
!     
  
!     lvzip_zipClose
!     lvzip_zipClose2
!     lvzip_zipCloseFileInZip
!     lvzip_zipCloseFileInZipRaw
! 	lvzip_zipOpen
!     lvzip_zipOpen2
!     lvzip_zipOpenNewFileInZip
!     lvzip_zipOpenNewFileInZip2
!     lvzip_zipOpenNewFileInZip3
!     lvzip_zipWriteInFileInZip

Index: zlibvc.dsp
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** zlibvc.dsp	24 Oct 2008 12:36:27 -0000	1.15
--- zlibvc.dsp	23 Dec 2008 07:50:32 -0000	1.16
***************
*** 4,7 ****
--- 4,8 ----
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+ # TARGTYPE "Win32 (x86) Static Library" 0x0104
  
  CFG=zlibvc - Win32 DLL Release
***************
*** 31,37 ****
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
- CPP=cl.exe
- MTL=midl.exe
- RSC=rc.exe
  
  !IF  "$(CFG)" == "zlibvc - Win32 DLL Release"
--- 32,35 ----
***************
*** 49,57 ****
--- 47,59 ----
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
+ LIB32=link.exe -lib
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
+ MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ RSC=rc.exe
  # ADD BASE RSC /l 0x40c /d "WIN32" /d "NDEBUG"
  # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_Release\lvzlib.res" /d "WIN32" /d "NDEBUG"
***************
*** 77,85 ****
--- 79,91 ----
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
+ LIB32=link.exe -lib
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c
  # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FR /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
+ MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+ RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "_DEBUG"
  # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_Debug\lvzlib.res" /d "WIN32" /d "_DEBUG"
***************
*** 106,115 ****
--- 112,125 ----
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
+ LIB32=link.exe -lib
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
+ MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf"
  # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf"
***************
*** 135,144 ****
--- 145,158 ----
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
+ LIB32=link.exe -lib
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
+ MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+ RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "_DEBUG"
  # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Debug\lvzlib.res" /d "WIN32" /d "_DEBUG"
***************
*** 165,174 ****
--- 179,194 ----
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
+ MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG"
  # ADD RSC /l 0x409 /d "WIN32" /d "NDEBUG"
***************
*** 176,182 ****
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
! LIB32=link.exe -lib
! # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo
  
  !ELSEIF  "$(CFG)" == "zlibvc - Win32 static ASM Release"
--- 196,202 ----
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 /machine:IX86
! # ADD LINK32 /machine:IX86
  
  !ELSEIF  "$(CFG)" == "zlibvc - Win32 static ASM Release"
***************
*** 194,203 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG"
  # ADD RSC /l 0x409 /d "WIN32" /d "NDEBUG"
--- 214,226 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
! RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG"
  # ADD RSC /l 0x409 /d "WIN32" /d "NDEBUG"
***************
*** 223,232 ****
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG"
  # ADD RSC /l 0x409 /d "WIN32" /d "NDEBUG"
--- 246,258 ----
  # PROP Ignore_Export_Lib 1
  # PROP Target_Dir ""
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ CPP=cl.exe
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT BASE CPP /YX /Yc /Yu
  # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
! RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG"
  # ADD RSC /l 0x409 /d "WIN32" /d "NDEBUG"
***************
*** 404,407 ****
--- 430,437 ----
  # Begin Source File
  
+ SOURCE=.\zalias.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\zconf.h
  # End Source File