diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2003-06-07 22:09:48 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2003-06-07 22:09:48 +0000 |
commit | 5191c1d5a85d6037d951f877eee67b94b669da7e (patch) | |
tree | 57007548daed9ef31884fdbe9398458989db24a3 /editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx | |
parent | Upgrade to OO1.1 beta2. (diff) |
Upgrade to OO1.1 beta2.
Notes
Notes:
svn path=/head/; revision=82477
Diffstat (limited to 'editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx')
-rw-r--r-- | editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx index 07d9f1060557..35a45ec90993 100644 --- a/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx +++ b/editors/openoffice.org-2-RC/files/patch-vcl+workben+officeacceptthread.cxx @@ -1,11 +1,15 @@ ---- ../vcl/workben/officeacceptthread.cxx.orig Wed Mar 5 20:25:36 2003 -+++ ../vcl/workben/officeacceptthread.cxx Wed Mar 5 20:26:03 2003 -@@ -125,7 +125,7 @@ - #if defined (SOLARIS) +--- ../vcl/workben/officeacceptthread.cxx.orig Tue Jun 3 11:27:35 2003 ++++ ../vcl/workben/officeacceptthread.cxx Tue Jun 3 11:27:38 2003 +@@ -122,10 +122,10 @@ + sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) + { + int nRet; +-#if defined (SOLARIS) ++#if defined (SOLARIS) || defined (FREEBSD) int status; nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); --#elif defined(LINUX) -+#elif defined(LINUX) || defined (FREEBSD) +-#elif defined(LINUX) || defined (FREEBSD) ++#elif defined(LINUX) nRet = kill(aProcessInfo.Ident, 0); #endif #if defined (UNX) |