[Cmake-commits] [cmake-commits] hoffman committed zconf.h 1.3 1.3.2.1 zutil.h 1.2 1.2.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmzlib
In directory public:/mounts/ram/cvs-serv11564/Utilities/cmzlib

Modified Files:
      Tag: CMake-2-6
	zconf.h zutil.h 
Log Message:
ENH: merge in the rest of the haiku changes 


Index: zconf.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmzlib/zconf.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** zconf.h	11 Sep 2007 15:22:29 -0000	1.3
--- zconf.h	4 Nov 2008 20:16:46 -0000	1.3.2.1
***************
*** 238,242 ****
  #endif
  
! #if defined (__BEOS__)
  #  ifdef ZLIB_DLL
  #    ifdef ZLIB_INTERNAL
--- 238,242 ----
  #endif
  
! #if defined (__BEOS__) && !defined (__HAIKU__)
  #  ifdef ZLIB_DLL
  #    ifdef ZLIB_INTERNAL

Index: zutil.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmzlib/zutil.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** zutil.h	11 Sep 2007 15:22:29 -0000	1.2
--- zutil.h	4 Nov 2008 20:16:46 -0000	1.2.2.1
***************
*** 148,152 ****
  #endif
  
! #if defined(_BEOS_) || defined(RISCOS)
  #  define fdopen(fd,mode) NULL /* No fdopen() */
  #endif
--- 148,158 ----
  #endif
  
! /* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
! /* many BeOS workarounds are no longer needed in Haiku */
! #if defined(__HAIKU__) && defined(__BEOS__)
! #undef __BEOS__
! #endif
! 
! #if defined(_BEOS_) || defined(RISCOS) 
  #  define fdopen(fd,mode) NULL /* No fdopen() */
  #endif