sal/osl/unx/process.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 90a3c0c0b46123a3647a53ddc942ba8614edb722
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Dec 5 08:27:20 2011 +0100
ChildStatusProc needs to be extern "C".
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index c35a340..57bc717 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -434,6 +434,8 @@ oslSocket osl_receiveResourcePipe(oslPipe pPipe)
*
*****************************************************************************/
+extern "C" {
+
static void ChildStatusProc(void *pData)
{
pid_t pid = -1;
@@ -703,6 +705,8 @@ static void ChildStatusProc(void *pData)
}
}
+}
+
/**********************************************
osl_executeProcess_WithRedirectedIO
*********************************************/
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
