[opengtoolkit-cvs] lvzip/c_source iomem.c, 1.4, 1.5 iomem.h, 1.1, 1.2 macbin.c, 1.30, 1.31 macbin.h, 1.23, 1.24 zlib.rc, 1.5, 1.6

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

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

Modified Files:
	iomem.c iomem.h macbin.c macbin.h zlib.rc 
Log Message:
Fix some compile errors on Mac OS X

Index: macbin.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** macbin.c	17 Sep 2007 12:29:41 -0000	1.30
--- macbin.c	17 Sep 2007 15:17:25 -0000	1.31
***************
*** 10,15 ****
  #include "zlib.h"
  #include "ioapi.h"
- #include "iomem.h"
  #include "macbin.h"
  
  #if Mac
--- 10,15 ----
  #include "zlib.h"
  #include "ioapi.h"
  #include "macbin.h"
+ #include "iomem.h"
  
  #if Mac
***************
*** 83,87 ****
  	  {
  	    /* fileNotFound is expected and normal. */
! 	    err = noErr;
  	  }
  	  else if (bdNamErr == err)
--- 83,87 ----
  	  {
  	    /* fileNotFound is expected and normal. */
! 	    err = mgNoErr;
  	  }
  	  else if (bdNamErr == err)
***************
*** 121,129 ****
  	/* root directory by passing a full pathname in MakeFSSpec's */
  	/* fileName parameter. */
! 	if ((err == noErr) && (fss->parID == 0))
  	{
  	  fss->parID = fsRtParID;
  	}
! 	return noErr;
  }
  
--- 121,129 ----
  	/* root directory by passing a full pathname in MakeFSSpec's */
  	/* fileName parameter. */
! 	if ((err == mgNoErr) && (fss->parID == 0))
  	{
  	  fss->parID = fsRtParID;
  	}
! 	return mgNoErr;
  }
  
***************
*** 189,194 ****
  	switch(err)
  	{
! 	  case noErr:
! 	    return noErr;
  	  case rfNumErr:
  	  case paramErr:
--- 189,194 ----
  	switch(err)
  	{
! 	  case mgNoErr:
! 	    return mgNoErr;
  	  case rfNumErr:
  	  case paramErr:
***************
*** 339,343 ****
  	switch (errno)
  	{
! 	  case 0:			return noErr;
  	  case ESPIPE:		return fEOF;
  	  case EINVAL:
--- 339,343 ----
  	switch (errno)
  	{
! 	  case 0:			return mgNoErr;
  	  case ESPIPE:		return fEOF;
  	  case EINVAL:
***************
*** 378,382 ****
  #if Mac
  	FSSpec theFSSpec;
! 	MgErr  err = noErr;
  
  	*hasResFork = 0;
--- 378,382 ----
  #if Mac
  	FSSpec theFSSpec;
! 	MgErr  err = mgNoErr;
  
  	*hasResFork = 0;
***************
*** 386,390 ****
  	{
  	  int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm);
! 	  if (ResError() == noErr) //we've got a resource file 
  	  {
  	    CloseResFile(theRefNum);
--- 386,390 ----
  	{
  	  int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm);
! 	  if (ResError() == mgNoErr) //we've got a resource file 
  	  {
  	    CloseResFile(theRefNum);
***************
*** 395,399 ****
  #else
  	*hasResFork = 0;
! 	return noErr;
  #endif
  }
--- 395,399 ----
  #else
  	*hasResFork = 0;
! 	return mgNoErr;
  #endif
  }
***************
*** 674,678 ****
                                           LStrHandle comment)
  {
! 	MgErr err = noErr;
  	int32 count = 0;
  #if Mac
--- 674,678 ----
                                           LStrHandle comment)
  {
! 	MgErr err = mgNoErr;
  	int32 count = 0;
  #if Mac
***************
*** 805,809 ****
  			  LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount;
  			  /* Ignore error for getting Desktop comments as this is not supported on OSX */
! 			  err = noErr;
  			}
  		  }
--- 805,809 ----
  			  LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount;
  			  /* Ignore error for getting Desktop comments as this is not supported on OSX */
! 			  err = mgNoErr;
  			}
  		  }
***************
*** 970,974 ****
  #endif
        }
! 	  return noErr;
  	}
  	else
--- 970,974 ----
  #endif
        }
! 	  return mgNoErr;
  	}
  	else
***************
*** 1003,1007 ****
  	if (posixRef)
  	{
! 	  err = noErr;
  	  if (posixPath && (*len > CFStringGetLength(posixRef)))
  	  {
--- 1003,1007 ----
  	if (posixRef)
  	{
! 	  err = mgNoErr;
  	  if (posixPath && (*len > CFStringGetLength(posixRef)))
  	  {

Index: macbin.h
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** macbin.h	17 Sep 2007 12:29:41 -0000	1.23
--- macbin.h	17 Sep 2007 15:17:25 -0000	1.24
***************
*** 89,94 ****
  
  enum {					/* Manager Error Codes */
  #if !Mac && !QTMLIncl
! 	noErr,
  #endif
  	mgArgErr=1,
--- 89,95 ----
  
  enum {					/* Manager Error Codes */
+ 	mgNoErr=0,
  #if !Mac && !QTMLIncl
! 	noErr = mgNoErr,
  #endif
  	mgArgErr=1,

Index: zlib.rc
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** zlib.rc	2 Apr 2007 21:11:48 -0000	1.5
--- zlib.rc	17 Sep 2007 15:17:25 -0000	1.6
***************
*** 3,8 ****
  #define IDR_VERSION1  1
  IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
!   FILEVERSION	 1,2,3,1
!   PRODUCTVERSION 1,2,3,1
    FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
    FILEFLAGS	0
--- 3,8 ----
  #define IDR_VERSION1  1
  IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
!   FILEVERSION	 2,4,1
!   PRODUCTVERSION 2,4,1
    FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
    FILEFLAGS	0
***************
*** 18,26 ****
      BEGIN
        VALUE "FileDescription",  "LabVIEW zlib data compression library\0"
!       VALUE "FileVersion",      "1.2.3.1.LV6\0"
        VALUE "InternalName",     "lvzlib\0"
        VALUE "OriginalFilename", "lvzlib.dll\0"
        VALUE "ProductName",      "LVZLib.DLL\0"
!       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant, ZIP support by Gilles Vollant, LabVIEW support by Rolf Kalbermatter\0"
        VALUE "LegalCopyright",   "(C) 1995-2005 Jean-loup Gailly & Mark Adler\0"
      END
--- 18,26 ----
      BEGIN
        VALUE "FileDescription",  "LabVIEW zlib data compression library\0"
!       VALUE "FileVersion",      "2.4.1.LV6\0"
        VALUE "InternalName",     "lvzlib\0"
        VALUE "OriginalFilename", "lvzlib.dll\0"
        VALUE "ProductName",      "LVZLib.DLL\0"
!       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\r\nZIP support by Gilles Vollant\r\nLabVIEW support by Rolf Kalbermatter\r\nBased on zlib 1.2.3 and minizip 1.01e\0"
        VALUE "LegalCopyright",   "(C) 1995-2005 Jean-loup Gailly & Mark Adler\0"
      END

Index: iomem.h
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iomem.h	16 Sep 2007 14:27:09 -0000	1.1
--- iomem.h	17 Sep 2007 15:17:25 -0000	1.2
***************
*** 15,19 ****
  #endif
  
! void fill_mem_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def, voidpf memory));
  
  #ifdef __cplusplus
--- 15,19 ----
  #endif
  
! void fill_mem_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory));
  
  #ifdef __cplusplus

Index: iomem.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** iomem.c	17 Sep 2007 12:29:41 -0000	1.4
--- iomem.c	17 Sep 2007 15:17:25 -0000	1.5
***************
*** 7,12 ****
  #include "zutil.h"
  #include "ioapi.h"
- #include "iomem.h"
  #include "macbin.h"
  
  voidpf ZCALLBACK mem_open_file_func OF((
--- 7,12 ----
  #include "zutil.h"
  #include "ioapi.h"
  #include "macbin.h"
+ #include "iomem.h"
  
  voidpf ZCALLBACK mem_open_file_func OF((
***************
*** 120,124 ****
          return fEOF;
  
!     return noErr;
  }
  
--- 120,124 ----
          return fEOF;
  
!     return mgNoErr;
  }
  
***************
*** 242,246 ****
  void fill_mem_filefunc (pzlib_filefunc_def, memory)
    zlib_filefunc_def* pzlib_filefunc_def;
!   UHandle *memory;
  {
      pzlib_filefunc_def->zopen_file = mem_open_file_func;
--- 242,246 ----
  void fill_mem_filefunc (pzlib_filefunc_def, memory)
    zlib_filefunc_def* pzlib_filefunc_def;
!   LStrHandle *memory;
  {
      pzlib_filefunc_def->zopen_file = mem_open_file_func;
***************
*** 254,258 ****
      {
          pzlib_filefunc_def->opaque = *memory;
!         *memory = DSNewHClr(sizeof(int32));
      }
      else
--- 254,258 ----
      {
          pzlib_filefunc_def->opaque = *memory;
!         *memory = (LStrHandle)DSNewHClr(sizeof(int32));
      }
      else