[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sd/source

Tor Lillqvist tml at iki.fi
Tue Feb 19 08:51:08 PST 2013


 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit f602b40561a381bcde713ecce7b2340be55dbd78
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 19 18:25:06 2013 +0200

    Surely we want closesocket() on Windows
    
    (cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95)
    
    Change-Id: I91461ae31c9934e6b3176402e2772ba7371f0fdb
    Reviewed-on: https://gerrit.libreoffice.org/2263
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 71fec17..e2c7a4a 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -59,7 +59,11 @@ void BufferedStreamSocket::close()
 {
     if( usingCSocket )
     {
+#ifdef WIN32
+        ::closesocket( mSocket );
+#else
         ::close( mSocket );
+#endif
         mSocket = -1;
     }
     else


More information about the Libreoffice-commits mailing list