[Cmake-commits] [cmake-commits] hoffman committed DynamicLoader.cxx 1.24 1.25 DynamicLoader.hxx.in 1.12 1.13

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Feb 3 11:27:10 EST 2009


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

Modified Files:
	DynamicLoader.cxx DynamicLoader.hxx.in 
Log Message:
ENH: fix dynamic loading on haiku


Index: DynamicLoader.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/DynamicLoader.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** DynamicLoader.cxx	15 Sep 2008 21:53:28 -0000	1.24
--- DynamicLoader.cxx	3 Feb 2009 16:27:08 -0000	1.25
***************
*** 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.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** DynamicLoader.hxx.in	7 Nov 2008 21:40:02 -0000	1.12
--- DynamicLoader.hxx.in	3 Feb 2009 16:27:08 -0000	1.13
***************
*** 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 ----



More information about the Cmake-commits mailing list