From: Rolf K. <lab...@us...> - 2007-12-10 13:47:39
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19502 Modified Files: iomem.c iowin32.c lvutil.c lvutil.h lvzip.cws lvzip.prj unzip.c Log Message: Small header file changes to support VxWorks target compilation Index: lvzip.prj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.prj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lvzip.prj 6 Dec 2007 23:05:25 -0000 1.1 --- lvzip.prj 10 Dec 2007 13:47:36 -0000 1.2 *************** *** 6,10 **** IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" ! Number of Files = 40 Target Type = "Dynamic Link Library" Flags = 2064 --- 6,10 ---- IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" ! Number of Files = 38 Target Type = "Dynamic Link Library" Flags = 2064 *************** *** 299,315 **** [File 0026] - File Type = "Include" - Res Id = 26 - Path Is Rel = True - Path Rel To = "Project" - Path Rel Path = "MacBinaryIII.h" - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/MacBinaryIII.h" - Exclude = False - Project Flags = 0 - Folder = "Headers" - - [File 0027] File Type = "CSource" ! Res Id = 27 Path Is Rel = True Path Rel To = "Project" --- 299,304 ---- [File 0026] File Type = "CSource" ! Res Id = 26 Path Is Rel = True Path Rel To = "Project" *************** *** 321,327 **** Folder = "Source Files" ! [File 0028] File Type = "Include" ! Res Id = 28 Path Is Rel = True Path Rel To = "Project" --- 310,316 ---- Folder = "Source Files" ! [File 0027] File Type = "Include" ! Res Id = 27 Path Is Rel = True Path Rel To = "Project" *************** *** 332,338 **** Folder = "Headers" ! [File 0029] File Type = "CSource" ! Res Id = 29 Path Is Rel = True Path Rel To = "Project" --- 321,327 ---- Folder = "Headers" ! [File 0028] File Type = "CSource" ! Res Id = 28 Path Is Rel = True Path Rel To = "Project" *************** *** 344,350 **** Folder = "Source Files" ! [File 0030] File Type = "Include" ! Res Id = 30 Path Is Rel = True Path Rel To = "Project" --- 333,339 ---- Folder = "Source Files" ! [File 0029] File Type = "Include" ! Res Id = 29 Path Is Rel = True Path Rel To = "Project" *************** *** 355,361 **** Folder = "Headers" ! [File 0031] File Type = "CSource" ! Res Id = 31 Path Is Rel = True Path Rel To = "Project" --- 344,350 ---- Folder = "Headers" ! [File 0030] File Type = "CSource" ! Res Id = 30 Path Is Rel = True Path Rel To = "Project" *************** *** 367,373 **** Folder = "Source Files" ! [File 0032] File Type = "CSource" ! Res Id = 32 Path Is Rel = True Path Rel To = "Project" --- 356,362 ---- Folder = "Source Files" ! [File 0031] File Type = "CSource" ! Res Id = 31 Path Is Rel = True Path Rel To = "Project" *************** *** 379,385 **** Folder = "Source Files" ! [File 0033] File Type = "Include" ! Res Id = 33 Path Is Rel = True Path Rel To = "Project" --- 368,374 ---- Folder = "Source Files" ! [File 0032] File Type = "Include" ! Res Id = 32 Path Is Rel = True Path Rel To = "Project" *************** *** 390,396 **** Folder = "Headers" ! [File 0034] File Type = "Include" ! Res Id = 34 Path Is Rel = True Path Rel To = "Project" --- 379,385 ---- Folder = "Headers" ! [File 0033] File Type = "Include" ! Res Id = 33 Path Is Rel = True Path Rel To = "Project" *************** *** 401,418 **** Folder = "Headers" ! [File 0035] ! File Type = "Include" ! Res Id = 35 ! Path Is Rel = True ! Path Rel To = "Project" ! Path Rel Path = "zconf.in.h" ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.in.h" ! Exclude = False ! Project Flags = 0 ! Folder = "Headers" ! ! [File 0036] File Type = "CSource" ! Res Id = 36 Path Is Rel = True Path Rel To = "Project" --- 390,396 ---- Folder = "Headers" ! [File 0034] File Type = "CSource" ! Res Id = 34 Path Is Rel = True Path Rel To = "Project" *************** *** 424,430 **** Folder = "Source Files" ! [File 0037] File Type = "Include" ! Res Id = 37 Path Is Rel = True Path Rel To = "Project" --- 402,408 ---- Folder = "Source Files" ! [File 0035] File Type = "Include" ! Res Id = 35 Path Is Rel = True Path Rel To = "Project" *************** *** 435,441 **** Folder = "Headers" ! [File 0038] File Type = "Include" ! Res Id = 38 Path Is Rel = True Path Rel To = "Project" --- 413,419 ---- Folder = "Headers" ! [File 0036] File Type = "Include" ! Res Id = 36 Path Is Rel = True Path Rel To = "Project" *************** *** 446,452 **** Folder = "Headers" ! [File 0039] File Type = "CSource" ! Res Id = 39 Path Is Rel = True Path Rel To = "Project" --- 424,430 ---- Folder = "Headers" ! [File 0037] File Type = "CSource" ! Res Id = 37 Path Is Rel = True Path Rel To = "Project" *************** *** 458,464 **** Folder = "Source Files" ! [File 0040] File Type = "Include" ! Res Id = 40 Path Is Rel = True Path Rel To = "Project" --- 436,442 ---- Folder = "Source Files" ! [File 0038] File Type = "Include" ! Res Id = 38 Path Is Rel = True Path Rel To = "Project" Index: lvutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lvutil.h 6 Dec 2007 18:55:01 -0000 1.2 --- lvutil.h 10 Dec 2007 13:47:36 -0000 1.3 *************** *** 22,28 **** #define BigEndian 1 #endif - #elif defined(__GNUC__) || defined(linux) - #define Unix 1 - #define BigEndian 0 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN32_WCE) #define Win32 1 --- 22,25 ---- *************** *** 31,34 **** --- 28,41 ---- #endif #define BigEndian 0 + #elif defined(linux) + #define Unix 1 + #define BigEndian 0 + #define HAVE_FCNTL + #elif defined(VXWORKS_PPC) + #define Unix 1 + #define BigEndian 1 + #elif defined(VXWORKS_X86) + #define Unix 1 + #define BigEndian 0 #endif Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lvzip.cws 6 Dec 2007 23:05:25 -0000 1.1 --- lvzip.cws 10 Dec 2007 13:47:36 -0000 1.2 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 160 ! Window Top = 610 ! Window Left = 1414 ! Window Bottom = 1546 ! Window Right = 2625 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 160 ! Window Top = 53 ! Window Left = 1331 ! Window Bottom = 1039 ! Window Right = 2867 Maximized = False Maximized Children = False *************** *** 44,56 **** [File 0001] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" - File Type = "CSource" - Disk Date = 3279791993 - In Projects = "1," - Window Top = 25 - Window Left = 10 - Source Window State = "1,821,821,821,8,43,8,0,0,133,0,0,0,0,0,38,359,0,378,19,518,1094,1,0," - - [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" --- 44,47 ---- *************** *** 61,65 **** 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" --- 52,56 ---- 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 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" *************** *** 70,74 **** 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" --- 61,65 ---- 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 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" *************** *** 79,83 **** 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" --- 70,74 ---- 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 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" *************** *** 86,90 **** 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" --- 77,81 ---- 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 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" *************** *** 93,117 **** Window Top = 46 Window Left = 42 ! Source Window State = "1,88,88,88,34,35,34,0,0,150,0,0,0,0,0,37,77,0,86,21,517,1234,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" Disk Date = 3279800147 In Projects = "1," ! Window Top = 28 ! Window Left = 44 ! Source Window State = "1,98,99,98,0,0,0,0,0,133,0,0,0,0,0,40,78,0,91,22,546,1097,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" ! Disk Date = 3279799477 In Projects = "1," ! Window Top = 34 Window Left = 320 ! Source Window State = "1,298,298,298,0,11,11,0,0,127,0,0,0,0,0,38,273,0,298,0,528,1050,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" --- 84,108 ---- Window Top = 46 Window Left = 42 ! 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 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" Disk Date = 3279800147 In Projects = "1," ! 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 0007] 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 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" *************** *** 122,126 **** Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" --- 113,117 ---- Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" *************** *** 131,135 **** 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 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" --- 122,126 ---- 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" *************** *** 140,144 **** 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 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" --- 131,135 ---- 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" *************** *** 147,151 **** 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/inffixed.h" File Type = "Include" --- 138,142 ---- 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" *************** *** 154,158 **** 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 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" --- 145,149 ---- 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" *************** *** 163,167 **** 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 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" --- 154,158 ---- 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" *************** *** 172,176 **** 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 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" --- 163,167 ---- 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.c" File Type = "CSource" *************** *** 179,185 **** Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,0,0,38,0,570,975,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" --- 170,176 ---- Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,3,0,38,0,570,975,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" *************** *** 188,194 **** Window Top = 26 Window Left = 162 ! Source Window State = "1,0,0,0,0,0,0,0,0,127,0,0,0,0,0,36,21,0,0,0,499,1052,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" --- 179,185 ---- Window Top = 26 Window Left = 162 ! 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 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" *************** *** 199,203 **** 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 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" --- 190,194 ---- 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 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" *************** *** 206,213 **** 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 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" ! Disk Date = 3279791904 In Projects = "1," Window Top = 68 --- 197,204 ---- 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 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" ! Disk Date = 3280134838 In Projects = "1," Window Top = 68 *************** *** 215,219 **** 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 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" --- 206,210 ---- 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 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" *************** *** 224,237 **** 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 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" ! Disk Date = 3272812294 In Projects = "1," Window Top = 26 Window Left = 66 ! Source Window State = "1,0,0,0,0,0,0,0,0,123,0,60,0,0,0,38,60,0,70,14,528,1016,1,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" --- 215,228 ---- 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 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" ! Disk Date = 3280139067 In Projects = "1," Window Top = 26 Window Left = 66 ! Source Window State = "1,70,71,70,0,0,0,0,0,123,0,60,0,0,0,38,60,0,70,0,528,1016,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" *************** *** 240,244 **** 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 0024] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" --- 231,235 ---- 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 0023] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" *************** *** 246,253 **** In Projects = "1," [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" ! Disk Date = 3279799954 In Projects = "1," Window Top = 48 --- 237,253 ---- In Projects = "1," + [File 0024] + Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" + File Type = "CSource" + Disk Date = 3280138995 + In Projects = "1," + Window Top = 25 + Window Left = 10 + Source Window State = "1,821,821,821,8,43,8,0,0,0,0,0,0,0,0,0,359,0,378,19,518,1094,1,0," + [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" ! Disk Date = 3280138886 In Projects = "1," Window Top = 48 *************** *** 256,268 **** [File 0026] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/MacBinaryIII.h" - File Type = "Include" - Disk Date = 3219509490 - In Projects = "1," - Window Top = 94 - Window Left = 42 - Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,9,276,630,1,0," - - [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" --- 256,259 ---- *************** *** 271,286 **** Window Top = 31 Window Left = 24 ! Source Window State = "1,12,12,12,10,15,10,0,0,130,0,0,0,0,0,38,0,0,16,19,522,1074,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" ! Disk Date = 3186836984 In Projects = "1," Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,113,0,0,0,0,0,34,7,0,0,0,471,939,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" --- 262,277 ---- Window Top = 31 Window Left = 24 ! 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" ! Disk Date = 3279800545 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,7,0,0,0,471,939,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" *************** *** 289,295 **** Window Top = 60 Window Left = 608 ! Source Window State = "1,33,33,33,11,22,11,0,0,80,0,0,0,0,0,33,30,0,50,41,457,670,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" --- 280,286 ---- Window Top = 60 Window Left = 608 ! 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" *************** *** 298,304 **** Window Top = 48 Window Left = 18 ! Source Window State = "1,0,0,0,0,0,0,0,0,79,0,0,0,0,0,39,0,0,0,0,540,666,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" --- 289,295 ---- Window Top = 48 Window Left = 18 ! 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" *************** *** 309,322 **** 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 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3279797865 In Projects = "1," Window Top = 25 Window Left = 5 ! Source Window State = "1,0,0,0,0,0,0,0,0,141,0,0,0,0,0,41,1518,0,1538,8,568,1163,1,0," ! [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" --- 300,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 = 3280139072 In Projects = "1," Window Top = 25 Window Left = 5 ! Source Window State = "1,1538,1539,1538,0,0,0,0,0,141,0,0,0,0,0,41,1527,0,1538,0,568,1163,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" *************** *** 327,347 **** 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 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" File Type = "Include" ! Disk Date = 3279800025 In Projects = "1," Window Top = 23 Window Left = 27 ! Source Window State = "1,235,235,235,11,24,11,0,0,99,0,0,0,0,0,40,190,0,200,39,545,823,1,0," ! ! [File 0035] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.in.h" ! File Type = "Include" ! Disk Date = 3219509183 ! 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 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" --- 318,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/zconf.h" File Type = "Include" ! Disk Date = 3279812177 In Projects = "1," Window Top = 23 Window Left = 27 ! Source Window State = "1,235,235,235,11,24,11,0,0,0,0,0,0,0,0,0,190,0,200,39,545,823,1,0," ! [File 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" *************** *** 350,356 **** Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,124,0,0,0,0,0,27,180,0,193,0,378,1028,1,0," ! [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" --- 334,340 ---- Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,0,0,0,0,0,0,0,180,0,193,0,378,1028,1,0," ! [File 0035] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" *************** *** 359,363 **** 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 0038] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" --- 343,347 ---- 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 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" *************** *** 366,372 **** Window Top = 26 Window Left = 154 ! Source Window State = "1,0,0,0,0,0,0,0,0,138,0,0,0,0,0,38,1330,0,1347,135,526,1136,1,0," ! [File 0039] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" --- 350,356 ---- Window Top = 26 Window Left = 154 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1330,0,1347,135,526,1136,1,0," ! [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" *************** *** 377,381 **** 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 0040] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" --- 361,365 ---- 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 0038] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" *************** *** 384,388 **** Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,123,0,0,0,0,0,41,0,0,0,0,568,1016,1,0," [Build Options 0001] --- 368,372 ---- 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,568,1016,1,0," [Build Options 0001] Index: iowin32.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iowin32.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iowin32.c 17 Sep 2007 05:07:16 -0000 1.6 --- iowin32.c 10 Dec 2007 13:47:36 -0000 1.7 *************** *** 69,73 **** int mode; { - const char* mode_fopen = NULL; DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; HANDLE hFile = 0; --- 69,72 ---- Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvutil.c 6 Dec 2007 18:55:01 -0000 1.3 --- lvutil.c 10 Dec 2007 13:47:36 -0000 1.4 *************** *** 235,239 **** } #elif Unix || Win32 ! static MakePathDSString(Path path, LStrPtr *lstr) { int32 pathLen = -1; --- 235,239 ---- } #elif Unix || Win32 ! static int32 MakePathDSString(Path path, LStrPtr *lstr) { int32 pathLen = -1; *************** *** 392,396 **** { int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm); ! if (ResError() == mgNoErr) //we've got a resource file { CloseResFile(theRefNum); --- 392,396 ---- { int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm); ! if (ResError() == mgNoErr) /* we've got a resource file */ { CloseResFile(theRefNum); *************** *** 634,638 **** } ! if (err = MakePathDSString(path, &lstr)) return err; --- 634,639 ---- } ! err = MakePathDSString(path, &lstr); ! if (err) return err; *************** *** 650,653 **** --- 651,655 ---- return UnixToLVFileErr(); + #ifdef HAVE_FCNTL /* Implement deny mode by range locking whole file */ if (denyMode == denyReadWrite || denyMode == denyWriteOnly) *************** *** 665,668 **** --- 667,671 ---- } } + #endif #else err = mgNotSupported; *************** *** 908,912 **** DSDisposePtr((UPtr)lstr); #elif Unix ! if (err = MakePathDSString(path, &lstr)) return err; --- 911,916 ---- DSDisposePtr((UPtr)lstr); #elif Unix ! err = MakePathDSString(path, &lstr); ! if (err) return err; Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** unzip.c 6 Dec 2007 18:56:17 -0000 1.9 --- unzip.c 10 Dec 2007 13:47:36 -0000 1.10 *************** *** 1537,1541 **** uLong uSizeBuf; { - int err=UNZ_OK; unz_s* s; uLong uReadThis ; --- 1537,1540 ---- Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** iomem.c 6 Dec 2007 18:55:01 -0000 1.8 --- iomem.c 10 Dec 2007 13:47:36 -0000 1.9 *************** *** 65,70 **** memio->error = 0; ! // if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE)) ! // memio->pos = LStrLen(*(LStrHandle)opaque); } return memio; --- 65,70 ---- memio->error = 0; ! /* if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE)) ! memio->pos = LStrLen(*(LStrHandle)opaque); */ } return memio; |