Menu
▾
▴
[opengtoolkit-cvs] lvzip/c_source lvutil.h, 1.4, 1.5 lvzip.cws, 1.5, 1.6 unzip.c, 1.10, 1.11 zip.c, 1.11, 1.12
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:48:58
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15588 Modified Files: lvutil.h lvzip.cws unzip.c zip.c Log Message: Modifications to better support compilation with LabWindows CVI Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** unzip.c 10 Dec 2007 13:47:36 -0000 1.10 --- unzip.c 27 Feb 2008 20:48:55 -0000 1.11 *************** *** 39,42 **** --- 39,43 ---- #include <stdlib.h> #include <string.h> + #define ZLIB_INTERNAL #include "zlib.h" #include "unzip.h" *************** *** 323,327 **** */ ! extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) const char* fileName1; const char* fileName2; --- 324,328 ---- */ ! ZEXTERN int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) const char* fileName1; const char* fileName2; *************** *** 411,415 **** of this unzip package. */ ! extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) const char *path; zlib_filefunc_def* pzlib_filefunc_def; --- 412,416 ---- of this unzip package. */ ! ZEXTERN unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) const char *path; zlib_filefunc_def* pzlib_filefunc_def; *************** *** 511,515 **** ! extern unzFile ZEXPORT unzOpen (path) const char *path; { --- 512,516 ---- ! ZEXTERN unzFile ZEXPORT unzOpen (path) const char *path; { *************** *** 522,526 **** these files MUST be closed with unzipCloseCurrentFile before call unzipClose. return UNZ_OK if there is no problem. */ ! extern int ZEXPORT unzClose (file) unzFile file; { --- 523,527 ---- these files MUST be closed with unzipCloseCurrentFile before call unzipClose. return UNZ_OK if there is no problem. */ ! ZEXTERN int ZEXPORT unzClose (file) unzFile file; { *************** *** 543,547 **** No preparation of the structure is needed return UNZ_OK if there is no problem. */ ! extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) unzFile file; unz_global_info *pglobal_info; --- 544,548 ---- No preparation of the structure is needed return UNZ_OK if there is no problem. */ ! ZEXTERN int ZEXPORT unzGetGlobalInfo (file,pglobal_info) unzFile file; unz_global_info *pglobal_info; *************** *** 744,748 **** return UNZ_OK if there is no problem. */ ! extern int ZEXPORT unzGetCurrentFileInfo (file, pfile_info, szFileName, fileNameBufferSize, --- 745,749 ---- return UNZ_OK if there is no problem. */ ! ZEXTERN int ZEXPORT unzGetCurrentFileInfo (file, pfile_info, szFileName, fileNameBufferSize, *************** *** 768,772 **** return UNZ_OK if there is no problem */ ! extern int ZEXPORT unzGoToFirstFile (file) unzFile file; { --- 769,773 ---- return UNZ_OK if there is no problem */ ! ZEXTERN int ZEXPORT unzGoToFirstFile (file) unzFile file; { *************** *** 790,794 **** return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ ! extern int ZEXPORT unzGoToNextFile (file) unzFile file; { --- 791,795 ---- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ ! ZEXTERN int ZEXPORT unzGoToNextFile (file) unzFile file; { *************** *** 824,828 **** UNZ_END_OF_LIST_OF_FILE if the file is not found */ ! extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) unzFile file; const char *szFileName; --- 825,829 ---- UNZ_END_OF_LIST_OF_FILE if the file is not found */ ! ZEXTERN int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) unzFile file; const char *szFileName; *************** *** 903,907 **** */ ! extern int ZEXPORT unzGetFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; --- 904,908 ---- */ ! ZEXTERN int ZEXPORT unzGetFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; *************** *** 921,925 **** } ! extern int ZEXPORT unzGoToFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; --- 922,926 ---- } ! ZEXTERN int ZEXPORT unzGoToFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; *************** *** 1047,1051 **** If there is no error and the file is opened, the return value is UNZ_OK. */ ! extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) unzFile file; int* method; --- 1048,1052 ---- If there is no error and the file is opened, the return value is UNZ_OK. */ ! ZEXTERN int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) unzFile file; int* method; *************** *** 1192,1196 **** } ! extern int ZEXPORT unzOpenCurrentFile (file) unzFile file; { --- 1193,1197 ---- } ! ZEXTERN int ZEXPORT unzOpenCurrentFile (file) unzFile file; { *************** *** 1198,1202 **** } ! extern int ZEXPORT unzOpenCurrentFilePassword (file, password) unzFile file; const char* password; --- 1199,1203 ---- } ! ZEXTERN int ZEXPORT unzOpenCurrentFilePassword (file, password) unzFile file; const char* password; *************** *** 1205,1209 **** } ! extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) unzFile file; int* method; --- 1206,1210 ---- } ! ZEXTERN int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) unzFile file; int* method; *************** *** 1224,1228 **** (UNZ_ERRNO for IO error, or zLib error for uncompress error) */ ! extern int ZEXPORT unzReadCurrentFile (file, buf, len) unzFile file; voidp buf; --- 1225,1229 ---- (UNZ_ERRNO for IO error, or zLib error for uncompress error) */ ! ZEXTERN int ZEXPORT unzReadCurrentFile (file, buf, len) unzFile file; voidp buf; *************** *** 1385,1389 **** Give the current position in uncompressed data */ ! extern z_off_t ZEXPORT unztell (file) unzFile file; { --- 1386,1390 ---- Give the current position in uncompressed data */ ! ZEXTERN z_off_t ZEXPORT unztell (file) unzFile file; { *************** *** 1405,1409 **** return 1 if the end of file was reached, 0 elsewhere */ ! extern int ZEXPORT unzeof (file) unzFile file; { --- 1406,1410 ---- return 1 if the end of file was reached, 0 elsewhere */ ! ZEXTERN int ZEXPORT unzeof (file) unzFile file; { *************** *** 1438,1442 **** the error code */ ! extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) unzFile file; voidp buf; --- 1439,1443 ---- the error code */ ! ZEXTERN int ZEXPORT unzGetLocalExtrafield (file,buf,len) unzFile file; voidp buf; *************** *** 1489,1493 **** Return UNZ_CRCERROR if all the file was read but the CRC is not good */ ! extern int ZEXPORT unzCloseCurrentFile (file) unzFile file; { --- 1490,1494 ---- Return UNZ_CRCERROR if all the file was read but the CRC is not good */ ! ZEXTERN int ZEXPORT unzCloseCurrentFile (file) unzFile file; { *************** *** 1532,1536 **** return the number of byte copied or an error code <0 */ ! extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) unzFile file; char *szComment; --- 1533,1537 ---- return the number of byte copied or an error code <0 */ ! ZEXTERN int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) unzFile file; char *szComment; *************** *** 1563,1567 **** /* Additions by RX '2004 */ ! extern uLong ZEXPORT unzGetOffset (file) unzFile file; { --- 1564,1568 ---- /* Additions by RX '2004 */ ! ZEXTERN uLong ZEXPORT unzGetOffset (file) unzFile file; { *************** *** 1579,1583 **** } ! extern int ZEXPORT unzSetOffset (file, pos) unzFile file; uLong pos; --- 1580,1584 ---- } ! ZEXTERN int ZEXPORT unzSetOffset (file, pos) unzFile file; uLong pos; Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lvzip.cws 27 Feb 2008 20:00:21 -0000 1.5 --- lvzip.cws 27 Feb 2008 20:48:55 -0000 1.6 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 51 ! Window Left = 65 ! Window Bottom = 790 ! Window Right = 1453 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 48 ! Window Left = 141 ! Window Bottom = 787 ! Window Right = 1529 Maximized = False Maximized Children = False *************** *** 26,30 **** Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 1 Window Confinement Region Enabled = True MainColumnWidth = 297 --- 26,30 ---- Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 4 Window Confinement Region Enabled = True MainColumnWidth = 297 *************** *** 44,57 **** [File 0001] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," ! Window Top = 26 ! Window Left = 6 Window Z-Order = 1 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,17,0,38,0,570,975,1,0," ! [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" --- 44,87 ---- [File 0001] + Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" + File Type = "Include" + Disk Date = 3286988591 + In Projects = "1," + Window Top = 25 + Window Left = 6 + Window Z-Order = 2 + Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," + + [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," ! Window Top = 29 ! Window Left = 15 Window Z-Order = 1 ! Source Window State = "1,0,0,0,0,0,0,0,0,99,0,0,0,0,0,46,17,0,38,0,633,827,1,0," ! [File 0003] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" ! File Type = "CSource" ! Disk Date = 3286985840 ! In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Window Z-Order = 3 ! Source Window State = "1,475,475,475,12,19,12,0,0,106,0,0,0,0,0,51,410,0,475,13,691,881,1,0," ! ! [File 0004] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" ! File Type = "Include" ! Disk Date = 3286989125 ! In Projects = "1," ! Window Top = 23 ! Window Left = 275 ! Window Z-Order = 4 ! Source Window State = "1,212,212,212,16,23,16,0,3,99,0,0,0,0,0,40,207,0,212,23,545,823,1,0," ! ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" *************** *** 62,66 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" --- 92,96 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" *************** *** 71,75 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" --- 101,105 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" *************** *** 80,84 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" --- 110,114 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" *************** *** 87,91 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" --- 117,121 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" *************** *** 96,100 **** Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" --- 126,130 ---- Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" *************** *** 103,118 **** Window Top = 23 Window Left = 208 ! Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,847,917,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" Disk Date = 3279812177 In Projects = "1," ! Window Top = 32 ! Window Left = 320 ! Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,270,0,298,0,530,1049,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" --- 133,148 ---- Window Top = 23 Window Left = 208 ! Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,785,917,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" Disk Date = 3279812177 In Projects = "1," ! Window Top = 23 ! Window Left = 259 ! Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,3,0,19,0,530,1049,1,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" *************** *** 123,127 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" --- 153,157 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" *************** *** 132,143 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," ! Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" --- 162,175 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,676,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" *************** *** 146,150 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" --- 178,182 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" *************** *** 155,159 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" --- 187,191 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" *************** *** 164,168 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" --- 196,200 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" *************** *** 173,177 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" --- 205,209 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" *************** *** 182,186 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" --- 214,218 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" *************** *** 189,193 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" --- 221,225 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" *************** *** 198,202 **** Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" --- 230,234 ---- Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" *************** *** 207,211 **** Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" --- 239,243 ---- Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" *************** *** 216,220 **** Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" --- 248,252 ---- Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0024] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" *************** *** 223,227 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" --- 255,259 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0025] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" *************** *** 229,251 **** In Projects = "1," ! [File 0023] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" ! File Type = "CSource" ! Disk Date = 3286985840 ! In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,426,0,476,19,691,883,1,0," ! ! [File 0024] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" ! File Type = "Include" ! Disk Date = 3280141347 ! In Projects = "1," ! Window Top = 30 ! Window Left = 5 ! Source Window State = "1,26,32,26,0,0,0,0,0,0,0,0,0,0,0,0,160,0,175,32,371,941,1,0," ! ! [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" --- 261,265 ---- In Projects = "1," ! [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" *************** *** 256,260 **** Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" --- 270,274 ---- Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" *************** *** 265,269 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" --- 279,283 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" *************** *** 274,278 **** Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" --- 288,292 ---- Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" *************** *** 283,287 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" --- 297,301 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" *************** *** 292,299 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3286985704 In Projects = "1," Window Top = 25 --- 306,313 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3286989094 In Projects = "1," Window Top = 25 *************** *** 301,305 **** Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" --- 315,319 ---- Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" *************** *** 310,326 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," - [File 0032] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" - File Type = "Include" - Disk Date = 3286985433 - In Projects = "1," - Window Top = 27 - Window Left = 24 - Source Window State = "1,211,212,211,0,0,0,0,0,0,0,0,0,0,0,0,195,0,211,0,545,823,1,0," - [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" ! Disk Date = 3286985713 In Projects = "1," Window Top = 48 --- 324,331 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" ! Disk Date = 3286989034 In Projects = "1," Window Top = 48 Index: lvutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lvutil.h 10 Dec 2007 14:24:54 -0000 1.4 --- lvutil.h 27 Feb 2008 20:48:55 -0000 1.5 *************** *** 8,11 **** --- 8,14 ---- #define _lvUtil_H + #define ZLIB_INTERNAL + #include "zlib.h" + #ifdef __cplusplus extern "C" { *************** *** 263,274 **** /* Our exported functions */ ! extern void ZEXPORT DLLVersion OF((uChar* Version)); ! extern MgErr ZEXPORT LVPath_ToText OF((Path path, CStr str, int32 *len)); ! extern MgErr ZEXPORT LVPath_HasResourceFork OF((Path path, int32 *hasResFork)); ! extern MgErr ZEXPORT LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName)); ! extern MgErr ZEXPORT LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName)); ! extern MgErr ZEXPORT LVPath_UtilFileInfo OF((Path path, uInt8 write, uInt8 *isDirectory, --- 266,277 ---- /* Our exported functions */ ! ZEXTERN void ZEXPORT DLLVersion OF((uChar* Version)); ! ZEXTERN MgErr ZEXPORT LVPath_ToText OF((Path path, CStr str, int32 *len)); ! ZEXTERN MgErr ZEXPORT LVPath_HasResourceFork OF((Path path, int32 *hasResFork)); ! ZEXTERN MgErr ZEXPORT LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName)); ! ZEXTERN MgErr ZEXPORT LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName)); ! ZEXTERN MgErr ZEXPORT LVPath_UtilFileInfo OF((Path path, uInt8 write, uInt8 *isDirectory, *************** *** 276,280 **** LStrHandle comment)); ! extern MgErr ZEXPORT LVPath_OpenFile OF((LVRefNum *refnum, Path path, uInt8 rsrc, --- 279,283 ---- LStrHandle comment)); ! ZEXTERN MgErr ZEXPORT LVPath_OpenFile OF((LVRefNum *refnum, Path path, uInt8 rsrc, *************** *** 282,286 **** uInt32 denyMode)); ! extern long ZEXPORT InitializeFileFuncs OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory)); #ifdef __cplusplus --- 285,289 ---- uInt32 denyMode)); ! ZEXTERN long ZEXPORT InitializeFileFuncs OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory)); #ifdef __cplusplus Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** zip.c 6 Dec 2007 18:56:17 -0000 1.11 --- zip.c 27 Feb 2008 20:48:55 -0000 1.12 *************** *** 15,18 **** --- 15,19 ---- #include <string.h> #include <time.h> + #define ZLIB_INTERNAL #include "zlib.h" #include "zip.h" *************** *** 686,690 **** } ! extern zipFile ZEXPORT zipOpen (pathname, append) const char *pathname; int append; --- 687,691 ---- } ! ZEXTERN zipFile ZEXPORT zipOpen (pathname, append) const char *pathname; int append; *************** *** 693,697 **** } ! extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, --- 694,698 ---- } ! ZEXTERN int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, *************** *** 902,906 **** } ! extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, --- 903,907 ---- } ! ZEXTERN int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, *************** *** 926,930 **** } ! extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, --- 927,931 ---- } ! ZEXTERN int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, *************** *** 970,974 **** } ! extern int ZEXPORT zipWriteInFileInZip (file, buf, len) zipFile file; const void* buf; --- 971,975 ---- } ! ZEXTERN int ZEXPORT zipWriteInFileInZip (file, buf, len) zipFile file; const void* buf; *************** *** 1035,1039 **** } ! extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) zipFile file; uLong uncompressed_size; --- 1036,1040 ---- } ! ZEXTERN int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) zipFile file; uLong uncompressed_size; *************** *** 1131,1135 **** } ! extern int ZEXPORT zipCloseFileInZip (file) zipFile file; { --- 1132,1136 ---- } ! ZEXTERN int ZEXPORT zipCloseFileInZip (file) zipFile file; { *************** *** 1137,1141 **** } ! extern int ZEXPORT zipClose2 (file, global_comment, output) zipFile file; const char* global_comment; --- 1138,1142 ---- } ! ZEXTERN int ZEXPORT zipClose2 (file, global_comment, output) zipFile file; const char* global_comment; *************** *** 1226,1230 **** } ! extern int ZEXPORT zipClose (file, global_comment) zipFile file; const char* global_comment; --- 1227,1231 ---- } ! ZEXTERN int ZEXPORT zipClose (file, global_comment) zipFile file; const char* global_comment; |
