[X2Go-Commits] [x2goclient] 271/276: src/pulsemanager.cpp: fix Linux-based code by fixing a really stupid typo ("erange" instead of "errno") and including the cerrno header.

git-admin at x2go.org git-admin at x2go.org
Sat Dec 31 01:35:43 CET 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 2f82839f87d823c84603ba13e3aece20dfb2c87a
Author: Mihai Moldovan <ionic at 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 5f702c6..e5a250a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -501,6 +501,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


More information about the x2go-commits mailing list