[Cmake-commits] [cmake-commits] hoffman committed DynamicLoader.cxx 1.23 1.24 ProcessUNIX.c 1.75 1.76 SystemTools.cxx 1.226 1.227 testDynamicLoader.cxx 1.22 1.23 testProcess.c 1.34 1.35

[cmake-commits at cmake.org]

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

Modified Files:
	DynamicLoader.cxx ProcessUNIX.c SystemTools.cxx 
	testDynamicLoader.cxx testProcess.c 
Log Message:
ENH: add initial support for HAIKU OS from bug# 7425


Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C 2 -d -r1.75 -r1.76
*** ProcessUNIX.c	20 Aug 2008 13:57:09 -0000	1.75
--- ProcessUNIX.c	15 Sep 2008 21:53:28 -0000	1.76
***************
*** 76,80 ****
  #endif
  
! #if defined(__BEOS__) && !defined(__ZETA__)
  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
  # include <be/kernel/OS.h>
--- 76,80 ----
  #endif
  
! #if defined(__BEOS__) && !defined(__ZETA__) 
  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
  # include <be/kernel/OS.h>

Index: testDynamicLoader.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/testDynamicLoader.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** testDynamicLoader.cxx	24 Nov 2007 01:45:49 -0000	1.22
--- testDynamicLoader.cxx	15 Sep 2008 21:53:28 -0000	1.23
***************
*** 18,25 ****
  #include KWSYS_HEADER(stl/string)
  
! #if defined(__BEOS__)
  #include <be/kernel/OS.h>  /* disable_debugger() API. */
  #endif
  
  // Work-around CMake dependency scanning limitation.  This must
  // duplicate the above list of headers.
--- 18,29 ----
  #include KWSYS_HEADER(stl/string)
  
! #if defined(__BEOS__) && !defined(__HAIKU__)
  #include <be/kernel/OS.h>  /* disable_debugger() API. */
  #endif
  
+ #if defined(__HAIKU__)
+ #include <os/kernel/OS.h>  /* disable_debugger() API. */
+ #endif
+ 
  // Work-around CMake dependency scanning limitation.  This must
  // duplicate the above list of headers.

Index: testProcess.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/testProcess.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C 2 -d -r1.34 -r1.35
*** testProcess.c	4 Dec 2006 19:42:47 -0000	1.34
--- testProcess.c	15 Sep 2008 21:53:28 -0000	1.35
***************
*** 35,39 ****
  #endif
  
! #if defined(__BEOS__) && !defined(__ZETA__)
  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
  # include <be/kernel/OS.h>
--- 35,39 ----
  #endif
  
! #if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
  # include <be/kernel/OS.h>

Index: DynamicLoader.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/DynamicLoader.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** DynamicLoader.cxx	2 Jun 2008 23:44:02 -0000	1.23
--- DynamicLoader.cxx	15 Sep 2008 21:53:28 -0000	1.24
***************
*** 336,344 ****
  
  // ---------------------------------------------------------------
! // 4. Implementation for BeOS
! #ifdef __BEOS__
  #include <string.h> // for strerror()
  #include <be/kernel/image.h>
  #include <be/support/Errors.h>
  #define DYNAMICLOADER_DEFINED 1
  
--- 336,354 ----
  
  // ---------------------------------------------------------------
! // 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
  

Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.226
retrieving revision 1.227
diff -C 2 -d -r1.226 -r1.227
*** SystemTools.cxx	27 May 2008 18:47:00 -0000	1.226
--- SystemTools.cxx	15 Sep 2008 21:53:28 -0000	1.227
***************
*** 132,136 ****
  #endif
  
! #if defined(__BEOS__) && !defined(__ZETA__)
  #include <be/kernel/OS.h>
  #include <be/storage/Path.h>
--- 132,141 ----
  #endif
  
! #if defined(__HAIKU__)
! #include <os/kernel/OS.h>
! #include <os/storage/Path.h>
! #endif
! 
! #if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
  #include <be/kernel/OS.h>
  #include <be/storage/Path.h>