diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-31 10:36:42 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-31 10:36:42 +0000 |
| commit | e0c7d05974152592527ebb3e60e5ec40d4d86819 (patch) | |
| tree | c88c1597ed781ddb600cc6079d824d9fdbb7931c /editors/openoffice-1.0/files | |
| parent | Add player for KDE2 case. (diff) | |
FreeBSD has waitpid() and does not need to workaround as Linux has to do.
Notes
Notes:
svn path=/head/; revision=63797
Diffstat (limited to 'editors/openoffice-1.0/files')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx | 18 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-sfx2::source::appl::officeacceptthread.cxx | 18 |
2 files changed, 36 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx new file mode 100644 index 000000000000..a33491e0d8b2 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx @@ -0,0 +1,18 @@ +--- ../sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 ++++ ../sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 +@@ -123,13 +123,13 @@ + sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) + { + int nRet; +-#if defined (SOLARIS) || defined (IRIX) ++#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) + int status; + nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); + #elif defined(LINUX) + nRet = kill(aProcessInfo.Ident, 0); + #endif +-#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) ++#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) + if ( nRet == 0 ) + return sal_True; // process is running + if ( nRet < 0 ) diff --git a/editors/openoffice-1.0/files/patch-sfx2::source::appl::officeacceptthread.cxx b/editors/openoffice-1.0/files/patch-sfx2::source::appl::officeacceptthread.cxx new file mode 100644 index 000000000000..a33491e0d8b2 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-sfx2::source::appl::officeacceptthread.cxx @@ -0,0 +1,18 @@ +--- ../sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 ++++ ../sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 +@@ -123,13 +123,13 @@ + sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) + { + int nRet; +-#if defined (SOLARIS) || defined (IRIX) ++#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) + int status; + nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); + #elif defined(LINUX) + nRet = kill(aProcessInfo.Ident, 0); + #endif +-#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) ++#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) + if ( nRet == 0 ) + return sal_True; // process is running + if ( nRet < 0 ) |