[Enigma-cvs] enigma/lib-src/zipios++/src directory.cpp, 1.2, 1.3 directory.h, 1.3, 1.4

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/lib-src/zipios++/src
In directory subversions:/tmp/cvs-serv9138/lib-src/zipios++/src

Modified Files:
        directory.cpp directory.h 
Log Message:
Merged changes from 0_80_rc branch

Index: directory.cpp
===================================================================
RCS file: /cvsroot/enigma/enigma/lib-src/zipios++/src/directory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** directory.cpp       15 Jun 2003 15:32:57 -0000      1.2
--- directory.cpp       18 Oct 2003 13:49:03 -0000      1.3
***************
*** 25,29 ****
  #include "directory.h"
  
! #if defined(unix) || defined(__unix) || defined(__unix__)
  #  define BOOST_UNIX 1
  #elif defined(_WINDOWS) || defined(__MINGW32__)
--- 25,29 ----
  #include "directory.h"
  
! #if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
  #  define BOOST_UNIX 1
  #elif defined(_WINDOWS) || defined(__MINGW32__)

Index: directory.h
===================================================================
RCS file: /cvsroot/enigma/enigma/lib-src/zipios++/src/directory.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** directory.h 15 Jun 2003 15:32:57 -0000      1.3
--- directory.h 18 Oct 2003 13:49:03 -0000      1.4
***************
*** 36,40 ****
  
  // Allow control over DLL version being built
! #if defined(unix) || defined(__unix) || defined(__unix__)
  #  define BOOST_DECL
  #elif defined(ZIPIOS_DLL)
--- 36,40 ----
  
  // Allow control over DLL version being built
! #if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
  #  define BOOST_DECL
  #elif defined(ZIPIOS_DLL)
***************
*** 49,53 ****
  // end of contents of boost.h
  
! #if defined(unix) || defined(__unix) || defined(__unix__)
  #include <sys/types.h>
  #endif
--- 49,53 ----
  // end of contents of boost.h
  
! #if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
  #include <sys/types.h>
  #endif
***************
*** 233,237 ****
  #endif
  
! #if defined(unix) || defined(__unix) || defined(__unix__)
  
          struct is_link { typedef bool value_type; };
--- 233,237 ----
  #endif
  
! #if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
  
          struct is_link { typedef bool value_type; };