[X2Go-Commits] [x2goclient] 01/02: 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
git-admin at x2go.org
Mon Jul 4 23:19:25 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 9947f8a77bd505107ed50c4d8e0cbfa6c30cfa8e
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 bd40313..9b5464f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -377,6 +377,9 @@ x2goclient (4.0.5.2-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.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 3fbdaeb..04661c6 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9788,7 +9788,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
More information about the x2go-commits
mailing list