This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 910a970a3c953b67784a26f827318d69b4b64ae0 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 10 14:48:45 2016 +0100 src/pulsemanager.cpp: fix Linux-based code by fixing a really stupid typo ("erange" instead of "errno") and including the cerrno header. --- debian/changelog | 2 ++ src/pulsemanager.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8a7d987..9cdde37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -499,6 +499,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium into the std namespace. - src/pulsemanager.h: use unix_stdint.h on non-Windows-platforms to get std::(u)int*_t types without having to use C++11. + - src/pulsemanager.cpp: fix Linux-based code by fixing a really stupid + typo ("erange" instead of "errno") and including the cerrno header. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp index 8b2e736..6e8df01 100644 --- a/src/pulsemanager.cpp +++ b/src/pulsemanager.cpp @@ -19,6 +19,7 @@ #include <unistd.h> #include <stdlib.h> +#include <cerrno> #include <QSysInfo> #if QT_VERSION >= 0x050000 @@ -163,7 +164,7 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()), memset (buf, 0, path_len); ptr = getcwd (buf, path_len); - if ((NULL == ptr) && (ERANGE != erange)) { + if ((NULL == ptr) && (ERANGE != errno)) { int saved_errno = errno; x2goErrorf (17) << "getcwd() failed: " << QString (strerror (saved_errno)); show_RichText_ErrorMsgBox (tr ("getcwd() failed!"), -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 73b5feba2a090f80304953d89b7e593f16f6869a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 10 14:59:09 2016 +0100 src/pulsemanager.cpp: cast the return value of realloc () to char*, as GCC doesn't seem to like reassigning the pointer otherwise. --- debian/changelog | 2 ++ src/pulsemanager.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b4d2d34..efe538b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -503,6 +503,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium typo ("erange" instead of "errno") and including the cerrno header. - src/pulsemanager.cpp: use std::ssize_t for the path length, because it could be -1 and std::size_t is not applicable. + - src/pulsemanager.cpp: cast the return value of realloc () to char*, as + GCC doesn't seem to like reassigning the pointer otherwise. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp index 1878b60..203ab29 100644 --- a/src/pulsemanager.cpp +++ b/src/pulsemanager.cpp @@ -153,7 +153,7 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()), char *buf, *ptr; for (buf = ptr = NULL; ptr == NULL; path_len += 20) { - if (NULL == (buf = realloc (buf, path_len))) { + if (NULL == (buf = static_cast<char *> (realloc (buf, path_len)))) { x2goErrorf (16) << "Could not allocate buffer for getting current working directory!"; show_RichText_ErrorMsgBox (tr ("Could not allocate buffer for getting current working directory!"), QString (), -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git