[X2Go-Commits] [x2goclient] 04/17: src/onmainwindow.cpp: use correct C++ universal initializer for initializing in_addr-type variable, the C-style universal zero initializer won't cut it here.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit c98ef8dc5d578441064f78f73127d8ee34af408d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jul 4 23:16:59 2016 +0200

    src/onmainwindow.cpp: use correct C++ universal initializer for initializing in_addr-type variable, the C-style universal zero initializer won't cut it here.
---
 debian/changelog     |    3 +++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a2cdd46..99cd289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -346,6 +346,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       variable initialization on Windows to silence compiler warning.
     - src/onmainwindow.cpp: fix compile error on Windows after moving some
       code around.
+    - src/onmainwindow.cpp: use correct C++ universal initializer for
+      initializing in_addr-type variable, the C-style universal zero
+      initializer won't cut it here.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index d6900e9..67a2259 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9802,7 +9802,7 @@ bool ONMainWindow::isServerRunning ( int port )
     int iResult;
     WSADATA wsaData;
 
-    struct in_addr addr = {{ 0 }};
+    struct in_addr addr = {{ }};
 
     iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
     if (iResult != 0)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git