[opengtoolkit-cvs] lvzip/c_source lvutil.c, 1.11, 1.12 lvutil.h, 1.6, 1.7

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

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

Modified Files:
	lvutil.c lvutil.h 
Log Message:
Replaced Mac preprocessor define with MacOS to avoid clashes with new 10.5 Security.framework headers

Index: lvutil.h
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lvutil.h	31 Mar 2008 20:45:25 -0000	1.6
--- lvutil.h	18 Nov 2008 07:20:50 -0000	1.7
***************
*** 16,20 ****
  
  #if defined(macintosh) || defined(__PPCC__) || defined(THINK_C) || defined(__SC__) || defined(__MWERKS__) || defined(__APPLE_CC__)
!  #define Mac 1
   #ifdef __MACH__
    #define MacOSX 1
--- 16,20 ----
  
  #if defined(macintosh) || defined(__PPCC__) || defined(THINK_C) || defined(__SC__) || defined(__MWERKS__) || defined(__APPLE_CC__)
!  #define MacOS 1
   #ifdef __MACH__
    #define MacOSX 1
***************
*** 53,57 ****
     #define DoDebugger()    {__asm int 3}
    #endif
!  #elif Mac
    #define DoDebugger()    Debugger()
   #else
--- 53,57 ----
     #define DoDebugger()    {__asm int 3}
    #endif
!  #elif MacOS
    #define DoDebugger()    Debugger()
   #else
***************
*** 107,111 ****
  enum {                  /* Manager Error Codes */
      mgNoErr=0,
! #if !Mac && !QTMLIncl
      noErr = mgNoErr,
  #endif
--- 107,111 ----
  enum {                  /* Manager Error Codes */
      mgNoErr=0,
! #if !MacOS && !QTMLIncl
      noErr = mgNoErr,
  #endif

Index: lvutil.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** lvutil.c	2 May 2008 12:09:26 -0000	1.11
--- lvutil.c	18 Nov 2008 07:20:50 -0000	1.12
***************
*** 14,18 ****
  #include "iomem.h"
  
! #if Mac
  #include <CoreServices/CoreServices.h>  /* instead of #include <Resources.h> */
  #include "MacBinaryIII.h"
--- 14,18 ----
  #include "iomem.h"
  
! #if MacOS
  #include <CoreServices/CoreServices.h>  /* instead of #include <Resources.h> */
  #include "MacBinaryIII.h"
***************
*** 39,43 ****
  #endif
  
! #if Mac
  static OSErr FSpLocationFromFullPath(CStr fullPath,
                                       int32 fullPathLength,
--- 39,43 ----
  #endif
  
! #if MacOS
  static OSErr FSpLocationFromFullPath(CStr fullPath,
                                       int32 fullPathLength,
***************
*** 486,490 ****
  extern MgErr ZEXPORT LVPath_HasResourceFork(Path path, int32 *hasResFork)
  {
! #if Mac
      FSSpec theFSSpec;
      MgErr  err = mgNoErr;
--- 486,490 ----
  extern MgErr ZEXPORT LVPath_HasResourceFork(Path path, int32 *hasResFork)
  {
! #if MacOS
      FSSpec theFSSpec;
      MgErr  err = mgNoErr;
***************
*** 511,515 ****
  extern MgErr ZEXPORT LVPath_EncodeMacbinary(Path srcPath, Path dstPath)
  {
! #if Mac
      FSSpec srcFSSpec;
      FSSpec dstFSSpec;
--- 511,515 ----
  extern MgErr ZEXPORT LVPath_EncodeMacbinary(Path srcPath, Path dstPath)
  {
! #if MacOS
      FSSpec srcFSSpec;
      FSSpec dstFSSpec;
***************
*** 531,535 ****
  extern MgErr ZEXPORT LVPath_DecodeMacbinary(Path srcPath, Path dstPath)
  {
! #if Mac
      FSSpec srcFSSpec;
      FSSpec dstFSSpec;
--- 531,535 ----
  extern MgErr ZEXPORT LVPath_DecodeMacbinary(Path srcPath, Path dstPath)
  {
! #if MacOS
      FSSpec srcFSSpec;
      FSSpec dstFSSpec;
***************
*** 553,557 ****
      MgErr err;
      File ioRefNum;
! #if Mac
      FSSpec fss;
      int16 perm;
--- 553,557 ----
      MgErr err;
      File ioRefNum;
! #if MacOS
      FSSpec fss;
      int16 perm;
***************
*** 574,578 ****
        return mgArgErr;
  
! #if Mac
      if (err = MakeMacSpec(path, &fss))
      {
--- 574,578 ----
        return mgArgErr;
  
! #if MacOS
      if (err = MakeMacSpec(path, &fss))
      {
***************
*** 791,795 ****
      MgErr err = mgNoErr;
      int32 count = 0;
! #if Mac
      FSSpec fss;
      DTPBRec dtpb;
--- 791,795 ----
      MgErr err = mgNoErr;
      int32 count = 0;
! #if MacOS
      FSSpec fss;
      DTPBRec dtpb;
***************
*** 808,812 ****
        return mgArgErr;
  
! #if Mac
      if (err = MakeMacSpec(path, &fss))
      {
--- 808,812 ----
        return mgArgErr;
  
! #if MacOS
      if (err = MakeMacSpec(path, &fss))
      {