From 7cbd8912d7a0057f718e30bb1f6631ec5a2d4fae Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 21 Aug 2008 17:28:12 +0000 Subject: [PATCH] removed a file that wasn't needed in the patch, ProcessUNIX.c.rej, which was created when merging previous patches. --- dev-util/cmake/cmake-2.6.1-haiku.diff | 58 +-------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/dev-util/cmake/cmake-2.6.1-haiku.diff b/dev-util/cmake/cmake-2.6.1-haiku.diff index 6c8e27cd6..1ce790b13 100644 --- a/dev-util/cmake/cmake-2.6.1-haiku.diff +++ b/dev-util/cmake/cmake-2.6.1-haiku.diff @@ -213,63 +213,7 @@ diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ } return 1; -diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c.rej cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c.rej ---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c.rej 1970-01-01 00:00:00.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c.rej 2008-08-20 13:48:25.000000000 +0000 -@@ -0,0 +1,53 @@ -+*************** -+*** 135,142 **** -+ static void kwsysProcessKill(pid_t process_id); -+ static int kwsysProcessesAdd(kwsysProcess* cp); -+ static void kwsysProcessesRemove(kwsysProcess* cp); -+ static void kwsysProcessesSignalHandler(int signum, siginfo_t* info, -+ void* ucontext); -+ static char** kwsysProcessParseVerbatimCommand(const char* command); -+ -+ /*--------------------------------------------------------------------------*/ -+--- 135,144 ---- -+ static void kwsysProcessKill(pid_t process_id); -+ static int kwsysProcessesAdd(kwsysProcess* cp); -+ static void kwsysProcessesRemove(kwsysProcess* cp); -++ #ifndef __HAIKU__ -+ static void kwsysProcessesSignalHandler(int signum, siginfo_t* info, -+ void* ucontext); -++ #endif -+ static char** kwsysProcessParseVerbatimCommand(const char* command); -+ -+ /*--------------------------------------------------------------------------*/ -+*************** -+*** 2396,2401 **** -+ } -+ -+ /*--------------------------------------------------------------------------*/ -+ static void kwsysProcessesSignalHandler(int signum, siginfo_t* info, -+ void* ucontext) -+ { -+--- 2400,2406 ---- -+ } -+ -+ /*--------------------------------------------------------------------------*/ -++ #ifndef __HAIKU__ -+ static void kwsysProcessesSignalHandler(int signum, siginfo_t* info, -+ void* ucontext) -+ { -+*************** -+*** 2417,2422 **** -+ write(cp->SignalPipe, &buf, 1); -+ } -+ } -+ -+ /*--------------------------------------------------------------------------*/ -+ static int kwsysProcessAppendByte(char* local, -+--- 2422,2428 ---- -+ write(cp->SignalPipe, &buf, 1); -+ } -+ } -++ #endif -+ -+ /*--------------------------------------------------------------------------*/ -+ static int kwsysProcessAppendByte(char* local, + diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx --- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 +++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-08-20 13:49:06.000000000 +0000