[Cmake-commits] [cmake-commits] hoffman committed DynamicLoader.cxx 1.22.10.2 1.22.10.3 DynamicLoader.hxx.in 1.10.16.2 1.10.16.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv23405/Source/kwsys

Modified Files:
      Tag: CMake-2-6
	DynamicLoader.cxx DynamicLoader.hxx.in 
Log Message:
ENH: merge in a few more changes for RC 11


Index: DynamicLoader.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/DynamicLoader.cxx,v
retrieving revision 1.22.10.2
retrieving revision 1.22.10.3
diff -C 2 -d -r1.22.10.2 -r1.22.10.3
*** DynamicLoader.cxx	24 Oct 2008 15:18:55 -0000	1.22.10.2
--- DynamicLoader.cxx	4 Feb 2009 22:04:49 -0000	1.22.10.3
***************
*** 336,353 ****
  
  // ---------------------------------------------------------------
! // 4. Implementation for BeOS / Haiku
! #if defined __BEOS__ || defined(__HAIKU__)
  
  #include <string.h> // for strerror()
  
- #ifdef __BEOS__
  #include <be/kernel/image.h>
  #include <be/support/Errors.h>
- #endif
- 
- #ifdef __HAIKU__
- #include <os/kernel/image.h>
- #include <os/support/Errors.h>
- #endif
  
  #define DYNAMICLOADER_DEFINED 1
--- 336,346 ----
  
  // ---------------------------------------------------------------
! // 4. Implementation for BeOS
! #if defined __BEOS__
  
  #include <string.h> // for strerror()
  
  #include <be/kernel/image.h>
  #include <be/support/Errors.h>
  
  #define DYNAMICLOADER_DEFINED 1

Index: DynamicLoader.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/DynamicLoader.hxx.in,v
retrieving revision 1.10.16.2
retrieving revision 1.10.16.3
diff -C 2 -d -r1.10.16.2 -r1.10.16.3
*** DynamicLoader.hxx.in	11 Nov 2008 21:52:22 -0000	1.10.16.2
--- DynamicLoader.hxx.in	4 Feb 2009 22:04:49 -0000	1.10.16.3
***************
*** 26,31 ****
      #include <mach-o/dyld.h>
    #endif
- #elif defined(__HAIKU__)
-   #include <os/kernel/image.h>
  #elif defined(__BEOS__)
    #include <be/kernel/image.h>
--- 26,29 ----
***************
*** 70,75 ****
      typedef void* LibraryHandle;
    #endif
- #elif defined(__HAIKU__)
-   typedef image_id LibraryHandle;
  #elif defined(__BEOS__)
    typedef image_id LibraryHandle;
--- 68,71 ----