[Cmake-commits] [cmake-commits] hoffman committed cmCTest.cxx 1.336 1.337 cmDependsJavaLexer.cxx 1.12 1.13 cmDependsJavaLexer.h 1.5 1.6 cmSystemTools.cxx 1.384 1.385

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmDependsJavaLexer.cxx cmDependsJavaLexer.h 
	cmSystemTools.cxx 
Log Message:
ENH: add initial support for HAIKU OS from bug# 7425


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.336
retrieving revision 1.337
diff -C 2 -d -r1.336 -r1.337
*** cmCTest.cxx	4 Jul 2008 13:50:31 -0000	1.336
--- cmCTest.cxx	15 Sep 2008 21:53:27 -0000	1.337
***************
*** 50,57 ****
  #include <memory> // auto_ptr
  
! #if defined(__BEOS__)
  #include <be/kernel/OS.h>   /* disable_debugger() API. */
  #endif
  
  #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
  #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
--- 50,62 ----
  #include <memory> // auto_ptr
  
! #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
+ 
+ 
  #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
  #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
***************
*** 611,615 ****
  #if defined(_WIN32)
    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
! #elif defined(__BEOS__)
    disable_debugger(1);
  #endif
--- 616,620 ----
  #if defined(_WIN32)
    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
! #elif defined(__BEOS__) || defined(__HAIKU__)
    disable_debugger(1);
  #endif

Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.384
retrieving revision 1.385
diff -C 2 -d -r1.384 -r1.385
*** cmSystemTools.cxx	19 Aug 2008 19:55:10 -0000	1.384
--- cmSystemTools.cxx	15 Sep 2008 21:53:27 -0000	1.385
***************
*** 933,936 ****
--- 933,937 ----
        }
      output += buffer;
+     buffer[0] = 0;
      fgets(buffer, BUFFER_SIZE, cpipe);
      }
***************
*** 972,975 ****
--- 973,977 ----
          break;
  #endif
+ #ifndef __HAIKU__
  #ifdef SIGBUS
        case SIGBUS:
***************
*** 977,980 ****
--- 979,983 ----
          break;
  #endif
+ #endif
  #ifdef SIGSEGV
        case SIGSEGV:
***************
*** 1699,1703 ****
  
  // no fchmod on BeOS 5...do pathname instead.
! #if defined(__BEOS__) && !defined(__ZETA__) 
    if ((oflags & O_CREAT) && chmod(pathname, mode))
      {
--- 1702,1706 ----
  
  // no fchmod on BeOS 5...do pathname instead.
! #if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
    if ((oflags & O_CREAT) && chmod(pathname, mode))
      {

Index: cmDependsJavaLexer.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsJavaLexer.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmDependsJavaLexer.cxx	24 Sep 2007 15:16:13 -0000	1.12
--- cmDependsJavaLexer.cxx	15 Sep 2008 21:53:27 -0000	1.13
***************
*** 24,28 ****
  #include <stdlib.h>
  
! #if defined(__BEOS__)
  #include <unistd.h>   /* prevents a conflict with a #define later on... */
  #endif
--- 24,28 ----
  #include <stdlib.h>
  
! #if defined(__BEOS__) || defined (__HAIKU__)
  #include <unistd.h>   /* prevents a conflict with a #define later on... */
  #endif

Index: cmDependsJavaLexer.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsJavaLexer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmDependsJavaLexer.h	27 Jul 2007 14:55:24 -0000	1.5
--- cmDependsJavaLexer.h	15 Sep 2008 21:53:27 -0000	1.6
***************
*** 39,43 ****
  #include <stdlib.h>
  
! #if defined(__BEOS__)
  #include <unistd.h>   /* prevents a conflict with a #define later on... */
  #endif
--- 39,43 ----
  #include <stdlib.h>
  
! #if defined(__BEOS__) || defined(__HAIKU__)
  #include <unistd.h>   /* prevents a conflict with a #define later on... */
  #endif