opengtoolkit-cvs

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

Update of /cvsroot/opengtoolkit/lvzip/c_source
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8748/c_source

Modified Files:
	Makefile lvutil.c 
Log Message:
Made it compile with Linux

Index: Makefile
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	17 Sep 2007 16:13:02 -0000	1.8
--- Makefile	18 Sep 2007 04:50:19 -0000	1.9
***************
*** 1,5 ****
  # Makefile for lvzlib
  # Copyright (C) 1995-2003 Jean-loup Gailly.
! # Copyright (C) 2003-2004 Rolf Kalbermatter.
  # For conditions of distribution and use, see copyright notice in zlib.h
  
--- 1,5 ----
  # Makefile for lvzlib
  # Copyright (C) 1995-2003 Jean-loup Gailly.
! # Copyright (C) 2003-2007 Rolf Kalbermatter.
  # For conditions of distribution and use, see copyright notice in zlib.h
  
***************
*** 138,156 ****
  adler32.o: zlib.h zconf.h
  compress.o: zlib.h zconf.h
! crc32.o: crc32.h zlib.h zconf.h
! deflate.o: deflate.h zutil.h zlib.h zconf.h
! example.o: zlib.h zconf.h
! gzio.o: zutil.h zlib.h zconf.h
! inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
! inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
! infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
! inftrees.o: zutil.h zlib.h zconf.h inftrees.h
! lvutil.o: zlib.h zconf.h ioapi.h iomem.h lvutil.h
! minigzip.o:  zlib.h zconf.h
! trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
  uncompr.o: zlib.h zconf.h
! zutil.o: zutil.h zlib.h zconf.h  
! ioapi.o: zlib.h zconf.h ioapi.h
! iomem.o: zlib.h zconf.h zutil.h ioapi.h lvutil.h
! zip.o: zlib.h zconf.h ioapi.h zip.h
! unzip.o: zlib.h zconf.h ioapi.h unzip.h
--- 138,482 ----
  adler32.o: zlib.h zconf.h
  compress.o: zlib.h zconf.h
! crc32.o: zutil.h zlib.h zconf.h /usr/include/string.h /usr/include/features.h
! crc32.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! crc32.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! crc32.o: /usr/include/stdlib.h /usr/include/sys/types.h
! crc32.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! crc32.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
! crc32.o: /usr/include/sys/select.h /usr/include/bits/select.h
! crc32.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! crc32.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! crc32.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h
! crc32.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! crc32.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! crc32.o: /usr/include/asm-generic/errno-base.h /usr/include/limits.h
! crc32.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h
! crc32.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h crc32.h
! deflate.o: deflate.h zutil.h zlib.h zconf.h /usr/include/string.h
! deflate.o: /usr/include/features.h /usr/include/sys/cdefs.h
! deflate.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! deflate.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! deflate.o: /usr/include/sys/types.h /usr/include/bits/types.h
! deflate.o: /usr/include/bits/typesizes.h /usr/include/time.h
! deflate.o: /usr/include/endian.h /usr/include/bits/endian.h
! deflate.o: /usr/include/sys/select.h /usr/include/bits/select.h
! deflate.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! deflate.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! deflate.o: /usr/include/alloca.h /usr/include/errno.h
! deflate.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! deflate.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! deflate.o: /usr/include/asm-generic/errno.h
! deflate.o: /usr/include/asm-generic/errno-base.h
! deflate.o: zutil.h zlib.h zconf.h /usr/include/string.h
! deflate.o: /usr/include/features.h /usr/include/sys/cdefs.h
! deflate.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! deflate.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! deflate.o: /usr/include/sys/types.h /usr/include/bits/types.h
! deflate.o: /usr/include/bits/typesizes.h /usr/include/time.h
! deflate.o: /usr/include/endian.h /usr/include/bits/endian.h
! deflate.o: /usr/include/sys/select.h /usr/include/bits/select.h
! deflate.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! deflate.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! deflate.o: /usr/include/alloca.h /usr/include/errno.h
! deflate.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! deflate.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! deflate.o: /usr/include/asm-generic/errno.h
! deflate.o: /usr/include/asm-generic/errno-base.h
! example.o: /usr/include/stdio.h /usr/include/features.h
! example.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! example.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! example.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! example.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! example.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! example.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! example.o: zlib.h zconf.h /usr/include/string.h /usr/include/stdlib.h
! example.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h
! example.o: /usr/include/bits/endian.h /usr/include/sys/select.h
! example.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
! example.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
! example.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
! gzio.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
! gzio.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! gzio.o: /usr/include/gnu/stubs-32.h /usr/include/bits/types.h
! gzio.o: /usr/include/bits/typesizes.h /usr/include/libio.h
! gzio.o: /usr/include/_G_config.h /usr/include/wchar.h
! gzio.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! gzio.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h zutil.h
! gzio.o: zlib.h zconf.h /usr/include/string.h /usr/include/stdlib.h
! gzio.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h
! gzio.o: /usr/include/bits/endian.h /usr/include/sys/select.h
! gzio.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
! gzio.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
! gzio.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
! gzio.o: /usr/include/errno.h /usr/include/bits/errno.h
! gzio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! gzio.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! gzio.o: /usr/include/asm-generic/errno-base.h
! infback.o: zutil.h zlib.h zconf.h /usr/include/string.h
! infback.o: /usr/include/features.h /usr/include/sys/cdefs.h
! infback.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! infback.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! infback.o: /usr/include/sys/types.h /usr/include/bits/types.h
! infback.o: /usr/include/bits/typesizes.h /usr/include/time.h
! infback.o: /usr/include/endian.h /usr/include/bits/endian.h
! infback.o: /usr/include/sys/select.h /usr/include/bits/select.h
! infback.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! infback.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! infback.o: /usr/include/alloca.h /usr/include/errno.h
! infback.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! infback.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! infback.o: /usr/include/asm-generic/errno.h
! infback.o: /usr/include/asm-generic/errno-base.h inftrees.h inflate.h
! infback.o: inffast.h inffixed.h
! inffast.o: zutil.h zlib.h zconf.h /usr/include/string.h
! inffast.o: /usr/include/features.h /usr/include/sys/cdefs.h
! inffast.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! inffast.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! inffast.o: /usr/include/sys/types.h /usr/include/bits/types.h
! inffast.o: /usr/include/bits/typesizes.h /usr/include/time.h
! inffast.o: /usr/include/endian.h /usr/include/bits/endian.h
! inffast.o: /usr/include/sys/select.h /usr/include/bits/select.h
! inffast.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! inffast.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! inffast.o: /usr/include/alloca.h /usr/include/errno.h
! inffast.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! inffast.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! inffast.o: /usr/include/asm-generic/errno.h
! inffast.o: /usr/include/asm-generic/errno-base.h inftrees.h inflate.h
! inffast.o: inffast.h
! inflate.o: zutil.h zlib.h zconf.h /usr/include/string.h
! inflate.o: /usr/include/features.h /usr/include/sys/cdefs.h
! inflate.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! inflate.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! inflate.o: /usr/include/sys/types.h /usr/include/bits/types.h
! inflate.o: /usr/include/bits/typesizes.h /usr/include/time.h
! inflate.o: /usr/include/endian.h /usr/include/bits/endian.h
! inflate.o: /usr/include/sys/select.h /usr/include/bits/select.h
! inflate.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! inflate.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! inflate.o: /usr/include/alloca.h /usr/include/errno.h
! inflate.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! inflate.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! inflate.o: /usr/include/asm-generic/errno.h
! inflate.o: /usr/include/asm-generic/errno-base.h inftrees.h inflate.h
! inflate.o: inffast.h inffixed.h
! inftrees.o: zutil.h zlib.h zconf.h /usr/include/string.h
! inftrees.o: /usr/include/features.h /usr/include/sys/cdefs.h
! inftrees.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! inftrees.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! inftrees.o: /usr/include/sys/types.h /usr/include/bits/types.h
! inftrees.o: /usr/include/bits/typesizes.h /usr/include/time.h
! inftrees.o: /usr/include/endian.h /usr/include/bits/endian.h
! inftrees.o: /usr/include/sys/select.h /usr/include/bits/select.h
! inftrees.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! inftrees.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! inftrees.o: /usr/include/alloca.h /usr/include/errno.h
! inftrees.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! inftrees.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! inftrees.o: /usr/include/asm-generic/errno.h
! inftrees.o: /usr/include/asm-generic/errno-base.h inftrees.h
! ioapi.o: /usr/include/stdio.h /usr/include/features.h
! ioapi.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! ioapi.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! ioapi.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! ioapi.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! ioapi.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! ioapi.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! ioapi.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! ioapi.o: /usr/include/endian.h /usr/include/bits/endian.h
! ioapi.o: /usr/include/sys/select.h /usr/include/bits/select.h
! ioapi.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! ioapi.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! ioapi.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h ioapi.h
! iomem.o: zutil.h zlib.h zconf.h /usr/include/string.h /usr/include/features.h
! iomem.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! iomem.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! iomem.o: /usr/include/stdlib.h /usr/include/sys/types.h
! iomem.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! iomem.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
! iomem.o: /usr/include/sys/select.h /usr/include/bits/select.h
! iomem.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! iomem.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! iomem.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h
! iomem.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! iomem.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! iomem.o: /usr/include/asm-generic/errno-base.h ioapi.h lvutil.h iomem.h
! iomem.o: /usr/include/stdlib.h /usr/include/features.h
! iomem.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! iomem.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! iomem.o: /usr/include/sys/types.h /usr/include/bits/types.h
! iomem.o: /usr/include/bits/typesizes.h /usr/include/time.h
! iomem.o: /usr/include/endian.h /usr/include/bits/endian.h
! iomem.o: /usr/include/sys/select.h /usr/include/bits/select.h
! iomem.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! iomem.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! iomem.o: /usr/include/alloca.h
! iowin32.o: /usr/include/stdlib.h /usr/include/features.h
! iowin32.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! iowin32.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! iowin32.o: /usr/include/sys/types.h /usr/include/bits/types.h
! iowin32.o: /usr/include/bits/typesizes.h /usr/include/time.h
! iowin32.o: /usr/include/endian.h /usr/include/bits/endian.h
! iowin32.o: /usr/include/sys/select.h /usr/include/bits/select.h
! iowin32.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! iowin32.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! iowin32.o: /usr/include/alloca.h zlib.h zconf.h ioapi.h iowin32.h
! lvutil.o: /usr/include/stdio.h /usr/include/features.h
! lvutil.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! lvutil.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! lvutil.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! lvutil.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! lvutil.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! lvutil.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! lvutil.o: /usr/include/string.h zlib.h zconf.h ioapi.h lvutil.h iomem.h
! lvutil.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! lvutil.o: /usr/include/endian.h /usr/include/bits/endian.h
! lvutil.o: /usr/include/sys/select.h /usr/include/bits/select.h
! lvutil.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! lvutil.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! lvutil.o: /usr/include/alloca.h /usr/include/sys/stat.h
! lvutil.o: /usr/include/bits/stat.h /usr/include/utime.h
! minigzip.o: /usr/include/stdio.h /usr/include/features.h
! minigzip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! minigzip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! minigzip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! minigzip.o: /usr/include/libio.h /usr/include/_G_config.h
! minigzip.o: /usr/include/wchar.h /usr/include/bits/wchar.h
! minigzip.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h
! minigzip.o: /usr/include/bits/sys_errlist.h zlib.h zconf.h
! minigzip.o: /usr/include/string.h /usr/include/stdlib.h
! minigzip.o: /usr/include/sys/types.h /usr/include/time.h
! minigzip.o: /usr/include/endian.h /usr/include/bits/endian.h
! minigzip.o: /usr/include/sys/select.h /usr/include/bits/select.h
! minigzip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! minigzip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! minigzip.o: /usr/include/alloca.h
! miniunz.o: /usr/include/stdio.h /usr/include/features.h
! miniunz.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! miniunz.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! miniunz.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! miniunz.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! miniunz.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! miniunz.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! miniunz.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! miniunz.o: /usr/include/endian.h /usr/include/bits/endian.h
! miniunz.o: /usr/include/sys/select.h /usr/include/bits/select.h
! miniunz.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! miniunz.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! miniunz.o: /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h
! miniunz.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! miniunz.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! miniunz.o: /usr/include/asm-generic/errno.h
! miniunz.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h
! miniunz.o: /usr/include/bits/fcntl.h unzip.h zlib.h zconf.h ioapi.h
! minizip.o: /usr/include/stdio.h /usr/include/features.h
! minizip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! minizip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! minizip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! minizip.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! minizip.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! minizip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! minizip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! minizip.o: /usr/include/endian.h /usr/include/bits/endian.h
! minizip.o: /usr/include/sys/select.h /usr/include/bits/select.h
! minizip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! minizip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! minizip.o: /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h
! minizip.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
! minizip.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h
! minizip.o: /usr/include/asm-generic/errno.h
! minizip.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h
! minizip.o: /usr/include/bits/fcntl.h zip.h zlib.h zconf.h ioapi.h
! mztools.o: /usr/include/stdio.h /usr/include/features.h
! mztools.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! mztools.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! mztools.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! mztools.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! mztools.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! mztools.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! mztools.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! mztools.o: /usr/include/endian.h /usr/include/bits/endian.h
! mztools.o: /usr/include/sys/select.h /usr/include/bits/select.h
! mztools.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! mztools.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! mztools.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h unzip.h
! mztools.o: ioapi.h
! mztools.o: zlib.h zconf.h unzip.h ioapi.h
! trees.o: deflate.h zutil.h zlib.h zconf.h /usr/include/string.h
! trees.o: /usr/include/features.h /usr/include/sys/cdefs.h
! trees.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! trees.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h
! trees.o: /usr/include/sys/types.h /usr/include/bits/types.h
! trees.o: /usr/include/bits/typesizes.h /usr/include/time.h
! trees.o: /usr/include/endian.h /usr/include/bits/endian.h
! trees.o: /usr/include/sys/select.h /usr/include/bits/select.h
! trees.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! trees.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! trees.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h
! trees.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! trees.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! trees.o: /usr/include/asm-generic/errno-base.h trees.h
  uncompr.o: zlib.h zconf.h
! unzip.o: /usr/include/stdio.h /usr/include/features.h
! unzip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! unzip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! unzip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! unzip.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
! unzip.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! unzip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! unzip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! unzip.o: /usr/include/endian.h /usr/include/bits/endian.h
! unzip.o: /usr/include/sys/select.h /usr/include/bits/select.h
! unzip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! unzip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! unzip.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h unzip.h
! unzip.o: ioapi.h /usr/include/errno.h /usr/include/bits/errno.h
! unzip.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! unzip.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! unzip.o: /usr/include/asm-generic/errno-base.h crypt.h
! unzip.o: zlib.h zconf.h ioapi.h
! zip.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
! zip.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
! zip.o: /usr/include/gnu/stubs-32.h /usr/include/bits/types.h
! zip.o: /usr/include/bits/typesizes.h /usr/include/libio.h
! zip.o: /usr/include/_G_config.h /usr/include/wchar.h
! zip.o: /usr/include/bits/wchar.h /usr/include/gconv.h
! zip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
! zip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
! zip.o: /usr/include/endian.h /usr/include/bits/endian.h
! zip.o: /usr/include/sys/select.h /usr/include/bits/select.h
! zip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! zip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! zip.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h zip.h
! zip.o: ioapi.h /usr/include/errno.h /usr/include/bits/errno.h
! zip.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! zip.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! zip.o: /usr/include/asm-generic/errno-base.h crypt.h
! zip.o: zlib.h zconf.h ioapi.h
! zlib.o: zconf.h
! zutil.o: zutil.h zlib.h zconf.h /usr/include/string.h /usr/include/features.h
! zutil.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! zutil.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! zutil.o: /usr/include/stdlib.h /usr/include/sys/types.h
! zutil.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! zutil.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
! zutil.o: /usr/include/sys/select.h /usr/include/bits/select.h
! zutil.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! zutil.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! zutil.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h
! zutil.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! zutil.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! zutil.o: /usr/include/asm-generic/errno-base.h
! zutil.o: zlib.h zconf.h /usr/include/string.h /usr/include/features.h
! zutil.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
! zutil.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
! zutil.o: /usr/include/stdlib.h /usr/include/sys/types.h
! zutil.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
! zutil.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
! zutil.o: /usr/include/sys/select.h /usr/include/bits/select.h
! zutil.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
! zutil.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
! zutil.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h
! zutil.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
! zutil.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h
! zutil.o: /usr/include/asm-generic/errno-base.h

Index: lvutil.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lvutil.c	17 Sep 2007 16:13:02 -0000	1.1
--- lvutil.c	18 Sep 2007 04:50:19 -0000	1.2
***************
*** 28,31 ****
--- 28,34 ----
  static MgErr OSErrToLVErr(OSErr err);
  #elif Unix
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <dirent.h>
  #elif Win32
  #include "iowin32.h"
***************
*** 61,65 ****
  	      CToPStr(lstr->str, name);
  	      ret = MakeFileSpec(0, 0, name, fss);
! 		  err = OSErrToLVErr(ret);
  	      if (err)
  	        DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld", ret, err));
--- 64,68 ----
  	      CToPStr(lstr->str, name);
  	      ret = MakeFileSpec(0, 0, name, fss);
! 	      err = OSErrToLVErr(ret);
  	      if (err)
  	        DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld", ret, err));
***************
*** 242,246 ****
  	  err = FPathToText(path, *lstr);
  	  if (err)
! 		DSDisposePtr((UPtr)lstr);
  	}
  	return err;
--- 245,249 ----
  	  err = FPathToText(path, *lstr);
  	  if (err)
! 	    DSDisposePtr((UPtr)lstr);
  	}
  	return err;
***************
*** 291,295 ****
  static MgErr Win32ToLVFileErr(void)
  {
! 	int32	err;
  
  	err = GetLastError();
--- 294,298 ----
  static MgErr Win32ToLVFileErr(void)
  {
! 	int32 err;
  
  	err = GetLastError();
***************
*** 335,339 ****
  }
  
! TH_REENTRANT static MgErr UnixToLVFileErr(void)
  {
  	switch (errno)
--- 338,342 ----
  }
  
! static MgErr UnixToLVFileErr(void)
  {
  	switch (errno)
***************
*** 405,409 ****
  	FSSpec dstFSSpec;
  	MgErr  err;
! 	
  	err = MakeMacSpec(srcPath, &srcFSSpec);
  	if (!err)
--- 408,412 ----
  	FSSpec dstFSSpec;
  	MgErr  err;
! 
  	err = MakeMacSpec(srcPath, &srcFSSpec);
  	if (!err)
***************
*** 425,429 ****
  	FSSpec dstFSSpec;
  	MgErr  err;
! 	
  	err = MakeMacSpec(srcPath, &srcFSSpec);
  	if (!err)
--- 428,432 ----
  	FSSpec dstFSSpec;
  	MgErr  err;
! 
  	err = MakeMacSpec(srcPath, &srcFSSpec);
  	if (!err)
***************
*** 451,460 ****
  #elif Win32
  	LStrPtr lstr;
! 	DWORD	shareAcc, openAcc;
! 	DWORD	createMode = OPEN_EXISTING;
! 	int32	attempts;
  #elif Unix
  	LStrPtr lstr;
  	uChar theMode[3];
  #endif
  	*refnum = 0;
--- 454,464 ----
  #elif Win32
  	LStrPtr lstr;
! 	DWORD shareAcc, openAcc;
! 	DWORD createMode = OPEN_EXISTING;
! 	int32 attempts;
  #elif Unix
  	LStrPtr lstr;
  	uChar theMode[3];
+ 	struct stat statbuf; 
  #endif
  	*refnum = 0;
***************
*** 469,473 ****
  	  return err;
  	}
! 		
  	switch (openMode)
  	{
--- 473,477 ----
  	  return err;
  	}
! 
  	switch (openMode)
  	{
***************
*** 514,520 ****
  	  pb.accessParam.ioDenyModes = perm;
  	  if (rsrc)
! 		ret = PBHOpenRFDenySync(&pb);
  	  else
! 		ret = PBHOpenDenySync(&pb);
  	}
  	else
--- 518,524 ----
  	  pb.accessParam.ioDenyModes = perm;
  	  if (rsrc)
! 	    ret = PBHOpenRFDenySync(&pb);
  	  else
! 	    ret = PBHOpenDenySync(&pb);
  	}
  	else
***************
*** 522,526 ****
  	  pb.ioParam.ioPermssn = perm;
  	  if (rsrc)
! 		ret = PBHOpenRFSync(&pb);
  	  else
  	    ret = PBHOpenSync(&pb);
--- 526,530 ----
  	  pb.ioParam.ioPermssn = perm;
  	  if (rsrc)
! 	    ret = PBHOpenRFSync(&pb);
  	  else
  	    ret = PBHOpenSync(&pb);
***************
*** 532,536 ****
  	  if (openMode == openWriteOnlyTruncate)
  	    err = OSErrToLVErr(SetEOF(ioRefNum, 0L));
! 	}	
  #elif Win32
  	if (FDepth(path) == 1L)
--- 536,540 ----
  	  if (openMode == openWriteOnlyTruncate)
  	    err = OSErrToLVErr(SetEOF(ioRefNum, 0L));
! 	}
  #elif Win32
  	if (FDepth(path) == 1L)
***************
*** 538,542 ****
  
  	if (rsrc)
! 		return mgNotSupported;
  
  	switch (openMode)
--- 542,546 ----
  
  	if (rsrc)
! 	  return mgNotSupported;
  
  	switch (openMode)
***************
*** 547,551 ****
  	  case openWriteOnlyTruncate:
  	    createMode = TRUNCATE_EXISTING;
! 		/* Intentionally falling through */
  	  case openWriteOnly:
  	    openAcc = GENERIC_WRITE;
--- 551,555 ----
  	  case openWriteOnlyTruncate:
  	    createMode = TRUNCATE_EXISTING;
! 	    /* Intentionally falling through */
  	  case openWriteOnly:
  	    openAcc = GENERIC_WRITE;
***************
*** 596,600 ****
  #elif Unix
  	if (rsrc)
! 		return mgNotSupported;
  
  	switch (openMode)
--- 600,604 ----
  #elif Unix
  	if (rsrc)
! 	  return mgNotSupported;
  
  	switch (openMode)
***************
*** 605,617 ****
  	  case openReadWrite:
  	    StrCpy(theMode, (uChar *)"r+");
! 		break;
  	  case openReadOnly:
! 		StrCpy(theMode, (uChar *)"r");
! 		break;
  	  case openWriteOnlyTruncate:
! 		StrCpy(theMode, (uChar *)"w");
! 		break;
  	  default:
! 		return mgArgErr;
  	}
  
--- 609,621 ----
  	  case openReadWrite:
  	    StrCpy(theMode, (uChar *)"r+");
! 	    break;
  	  case openReadOnly:
! 	    StrCpy(theMode, (uChar *)"r");
! 	    break;
  	  case openWriteOnlyTruncate:
! 	    StrCpy(theMode, (uChar *)"w");
! 	    break;
  	  default:
! 	    return mgArgErr;
  	}
  
***************
*** 653,658 ****
  	  if (fcntl(fileno((FILE *)ioRefNum), F_SETLK, (int32) &lockInfo) == -1)
  	  {
! 		err = UnixToLVFileErr();
! 		fclose((FILE *)ioRefNum);
  	  }
  	}
--- 657,662 ----
  	  if (fcntl(fileno((FILE *)ioRefNum), F_SETLK, (int32) &lockInfo) == -1)
  	  {
! 	    err = UnixToLVFileErr();
! 	    fclose((FILE *)ioRefNum);
  	  }
  	}
***************
*** 670,674 ****
  extern MgErr ZEXPORT LVPath_UtilFileInfo(Path path,
                                           uInt8 write,
! 										 uInt8 *isDirectory,
                                           LVFileInfo *fileInfo,
                                           LStrHandle comment)
--- 674,678 ----
  extern MgErr ZEXPORT LVPath_UtilFileInfo(Path path,
                                           uInt8 write,
!                                          uInt8 *isDirectory,
                                           LVFileInfo *fileInfo,
                                           LStrHandle comment)
***************
*** 720,724 ****
  	  if (!err)
  	  {
! 	  	dtpb.ioNamePtr = fss.name;
  	    dtpb.ioDirID = fss.parID;
  	    *isDirectory = (MacIsDir(cpb) != 0);
--- 724,728 ----
  	  if (!err)
  	  {
! 	    dtpb.ioNamePtr = fss.name;
  	    dtpb.ioDirID = fss.parID;
  	    *isDirectory = (MacIsDir(cpb) != 0);
***************
*** 757,761 ****
  	        dtpb.ioDTBuffer = LStrBuf(*comment);
  	        dtpb.ioDTReqCount = LStrLen(*comment);
! 			/* Ignore error for setting Desktop comments as this is not supported on OSX */
  	        PBDTSetCommentSync(&dtpb);
  	      }
--- 761,765 ----
  	        dtpb.ioDTBuffer = LStrBuf(*comment);
  	        dtpb.ioDTReqCount = LStrLen(*comment);
! 	        /* Ignore error for setting Desktop comments as this is not supported on OSX */
  	        PBDTSetCommentSync(&dtpb);
  	      }
***************
*** 765,769 ****
  	      if (*isDirectory)
  	      {
! 			fileInfo->type = kUnknownType;
  	        fileInfo->creator = kUnknownType;
  	        fileInfo->flags = cpb.dirInfo.ioDrUsrWds.frFlags;
--- 769,773 ----
  	      if (*isDirectory)
  	      {
! 	        fileInfo->type = kUnknownType;
  	        fileInfo->creator = kUnknownType;
  	        fileInfo->flags = cpb.dirInfo.ioDrUsrWds.frFlags;
***************
*** 794,811 ****
  	      }
  
! 		  if (comment)
! 		  {
! 			err = DSSetHandleSize((UHandle)comment, 255);
! 		    if (!err)
! 			{
! 		      dtpb.ioDTBuffer = LStrBuf(*comment);
  	          dtpb.ioDTReqCount = LStrLen(*comment) = 255;
  	          dtpb.ioDTActCount = 0;
  	          err = OSErrToLVErr(PBDTGetCommentSync(&dtpb));
! 			  LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount;
! 			  /* Ignore error for getting Desktop comments as this is not supported on OSX */
! 			  err = mgNoErr;
! 			}
! 		  }
  	    }
  	  }
--- 798,815 ----
  	      }
  
! 	      if (comment)
! 	      {
! 	        err = DSSetHandleSize((UHandle)comment, 255);
! 	        if (!err)
! 	        {
! 	          dtpb.ioDTBuffer = LStrBuf(*comment);
  	          dtpb.ioDTReqCount = LStrLen(*comment) = 255;
  	          dtpb.ioDTActCount = 0;
  	          err = OSErrToLVErr(PBDTGetCommentSync(&dtpb));
! 	          LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount;
! 	          /* Ignore error for getting Desktop comments as this is not supported on OSX */
! 	          err = mgNoErr;
! 	        }
! 	      }
  	    }
  	  }
***************
*** 826,835 ****
  	  handle = FindFirstFileA(lstr->str, &fi);
  	  if (handle == INVALID_HANDLE_VALUE)
! 		err = Win32ToLVFileErr();
  	  else
  	  {
  	    *isDirectory = ((fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0);
! 		if (!FindClose(handle)) 
! 		  err = Win32ToLVFileErr();
  	  }
  	}
--- 830,839 ----
  	  handle = FindFirstFileA(lstr->str, &fi);
  	  if (handle == INVALID_HANDLE_VALUE)
! 	    err = Win32ToLVFileErr();
  	  else
  	  {
  	    *isDirectory = ((fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0);
! 	    if (!FindClose(handle)) 
! 	      err = Win32ToLVFileErr();
  	  }
  	}
***************
*** 843,855 ****
  	    if (!SetFileTime(handle, &fi.ftCreationTime, &fi.ftLastAccessTime, &fi.ftLastWriteTime))
  	      err = Win32ToLVFileErr();
! 		fi.dwFileAttributes = GetFileAttributesA(lstr->str);
! 		if (fi.dwFileAttributes != INVALID_FILE_ATTRIBUTES)
! 		{
! 		  if (fileInfo->flags & 0x4000)
  	        fi.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
  	      else
  	        fi.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN;
! 		  SetFileAttributesA(lstr->str, fi.dwFileAttributes);
! 		}
  	  }
  	  else
--- 847,859 ----
  	    if (!SetFileTime(handle, &fi.ftCreationTime, &fi.ftLastAccessTime, &fi.ftLastWriteTime))
  	      err = Win32ToLVFileErr();
! 	    fi.dwFileAttributes = GetFileAttributesA(lstr->str);
! 	    if (fi.dwFileAttributes != INVALID_FILE_ATTRIBUTES)
! 	    {
! 	      if (fileInfo->flags & 0x4000)
  	        fi.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
  	      else
  	        fi.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN;
! 	        SetFileAttributesA(lstr->str, fi.dwFileAttributes);
! 	    }
  	  }
  	  else
***************
*** 862,904 ****
  	    fileInfo->flags = (fi.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 0x4000 : 0;
  	    if (*isDirectory)
! 		{
! 		  Path temp = path;
! 		  
! 		  count = 1;
  
  	      DSDisposePtr((UPtr)lstr);
! 		  err = FPathToPath(&temp);
! 		  if (!err)
! 		    err = FAppendName(temp, "\003*.*");
  
  	      err = MakePathDSString(temp, &lstr);
  	      FDisposePath(temp);
  
! 		  if (!err)
! 		  {
  	        handle = FindFirstFileA(lstr->str, &fi);
! 		    if (handle == INVALID_HANDLE_VALUE)
! 			  count = 0;
! 		    else
! 		      for (;FindNextFile(handle, &fi);)
! 			    count++;
! 		    FindClose(handle);
  
! 		    if (FDepth(path) == 1)
! 			  fileInfo->size = count;
! 		    else
! 			  fileInfo->size = count - 2;
! 		  }
! 		}
  	    else
! 		{
  	      fileInfo->size = fi.nFileSizeLow;
! 		}
  	  }
  	}
  	DSDisposePtr((UPtr)lstr);
  #elif Unix
- 	MgErr 
- 
  	if (err = MakePathDSString(path, &lstr))
  	  return err;
--- 866,906 ----
  	    fileInfo->flags = (fi.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 0x4000 : 0;
  	    if (*isDirectory)
! 	    {
! 	      Path temp = path;
! 
! 	      count = 1;
  
  	      DSDisposePtr((UPtr)lstr);
! 	      err = FPathToPath(&temp);
! 	      if (!err)
! 	        err = FAppendName(temp, "\003*.*");
  
  	      err = MakePathDSString(temp, &lstr);
  	      FDisposePath(temp);
  
! 	      if (!err)
! 	      {
  	        handle = FindFirstFileA(lstr->str, &fi);
! 	        if (handle == INVALID_HANDLE_VALUE)
! 	          count = 0;
! 	        else
! 	          for (;FindNextFile(handle, &fi);)
! 	            count++;
! 	        FindClose(handle);
  
! 	        if (FDepth(path) == 1)
! 	          fileInfo->size = count;
! 	        else
! 	          fileInfo->size = count - 2;
! 	      }
! 	    }
  	    else
! 	    {
  	      fileInfo->size = fi.nFileSizeLow;
! 	    }
  	  }
  	}
  	DSDisposePtr((UPtr)lstr);
  #elif Unix
  	if (err = MakePathDSString(path, &lstr))
  	  return err;
***************
*** 924,949 ****
  	  else
  	  {
! 		fileInfo->type = kUnknownType;
! 		fileInfo->creator = kUnknownCreator;
! 		UnixConvertToLVTime(statbuf.st_ctime, &fileInfo->cDate);
  	    UnixConvertToLVTime(statbuf.st_mtime, &fileInfo->mDate);
  	    fileInfo->rfSize = 0;
  	    if (*isDirectory)
! 		{
  	      DIR *dirp;
  	      struct dirent *dp;
  
! 		  if (!(dirp = opendir( thePath)))
! 		    return UnixToLVFileErr();
  
! 		  for (dp = readdir(dirp); dp; dp = readdir(dirp))
! 			count++;
! 		  closedir(dirp);
! 		  fileInfo->size = count - 2;
! 		}
! 		else
! 		{
! 		  fileInfo->size = statbuf.st_size;
! 		}
  	  }
  	}
--- 926,951 ----
  	  else
  	  {
! 	    fileInfo->type = kUnknownFileType;
! 	    fileInfo->creator = kUnknownCreator;
! 	    UnixConvertToLVTime(statbuf.st_ctime, &fileInfo->cDate);
  	    UnixConvertToLVTime(statbuf.st_mtime, &fileInfo->mDate);
  	    fileInfo->rfSize = 0;
  	    if (*isDirectory)
! 	    {
  	      DIR *dirp;
  	      struct dirent *dp;
  
! 	      if (!(dirp = opendir(lstr->str)))
! 	        return UnixToLVFileErr();
  
! 	      for (dp = readdir(dirp); dp; dp = readdir(dirp))
! 	        count++;
! 	      closedir(dirp);
! 	      fileInfo->size = count - 2;
! 	    }
! 	    else
! 	    {
! 	      fileInfo->size = statbuf.st_size;
! 	    }
  	  }
  	}
***************
*** 959,967 ****
  	{
  	  if (memory)
!       {
  	    fill_mem_filefunc(pzlib_filefunc_def, memory);
!       }
!       else
!       {
  #if Win32
  	    fill_win32_filefunc(pzlib_filefunc_def);
--- 961,969 ----
  	{
  	  if (memory)
! 	  {
  	    fill_mem_filefunc(pzlib_filefunc_def, memory);
! 	  }
! 	  else
! 	  {
  #if Win32
  	    fill_win32_filefunc(pzlib_filefunc_def);
***************
*** 987,991 ****
  	if (!len)
  	  return mgArgErr;
! 	
  	fileRef = CFStringCreateWithCString(NULL, hfsPath, enc);
  	if (fileRef)
--- 989,993 ----
  	if (!len)
  	  return mgArgErr;
! 
  	fileRef = CFStringCreateWithCString(NULL, hfsPath, enc);
  	if (fileRef)
***************
*** 1024,1028 ****
  	if (!len)
  	  return mgArgErr;
- 	
  	err = FPathToText(path, (LStrPtr)&pathLen);
  	if (!err)
--- 1026,1029 ----