Attachment 166629 Details for Bug 205922 – 1/3

[patch] 1/3

patch-sal_osl_unx_pipe.cxx (text/plain), 1.50 KB, created by Matthias Apitz on 2016-02-05 21:02:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Apitz

Created: 2016-02-05 21:02:30 UTC

Size: 1.50 KB

patch

obsolete

>--- sal/osl/unx/pipe.cxx.orig	2015-12-11 03:29:35.000000000 +0100
>+++ sal/osl/unx/pipe.cxx	2016-02-05 20:37:35.583893000 +0100
>@@ -82,10 +82,10 @@
>         return NULL;
>     pPipeImpl->m_nRefCount =1;
>     pPipeImpl->m_bClosed = false;
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pPipeImpl->m_bIsInShutdown = false;
>     pPipeImpl->m_bIsAccepting = false;
>-#endif
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
>     return pPipeImpl;
> }
> 
>@@ -359,7 +359,7 @@
>       Thread does not return from accept on linux, so
>       connect to the accepting pipe
>      */
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     struct sockaddr_un addr;
> 
>     if ( pPipe->m_bIsAccepting )
>@@ -387,7 +387,7 @@
>         }
>         close(fd);
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
> 
>     nRet = shutdown(ConnFD, 2);
>     if ( nRet < 0 )
>@@ -421,13 +421,13 @@
> 
>     OSL_ASSERT(strlen(pPipe->m_Name) > 0);
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pPipe->m_bIsAccepting = true;
> #endif
> 
>     s = accept(pPipe->m_Socket, NULL, NULL);
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pPipe->m_bIsAccepting = false;
> #endif
> 
>@@ -437,13 +437,13 @@
>         return NULL;
>     }
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     if ( pPipe->m_bIsInShutdown  )
>     {
>         close(s);
>         return NULL;
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
>     else
>     {
>         /* alloc memory */

Actions: View | Diff

Attachments on bug 205922: 166629 | 166630 | 166631