[X2Go-Commits] [x2goclient] 12/47: unixhelper.{h, cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 4 01:46:29 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit f2daaac5ccfaf9f070e27f0c82947469c207eae2
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Mar 16 21:13:05 2015 +0100
unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around.
---
debian/changelog | 2 ++
src/unixhelper.cpp | 5 ++++-
src/unixhelper.h | 9 ++++++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3055d43..29ad6e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
- x2goclient.cpp: add legacy <sys/types.h> header needed for old operating
systems.
- x2goclient.cpp: fix std::edit -> std::exit typo.
+ - unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX
+ defined on UNIX-based platforms. Move guards around.
-- X2Go Release Manager <git-admin at x2go.org> Tue, 26 May 2015 21:42:09 +0200
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index 545c2c1..b326f35 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -17,6 +17,10 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+/* Necessary for Q_OS_UNIX! */
+
+#include "unixhelper.h"
+
#ifdef Q_OS_UNIX
#include <csignal>
@@ -26,7 +30,6 @@
#include <cerrno>
#include <cstdlib>
-#include "unixhelper.h"
void unixhelper::kill_pgroup (int signal) {
if (SIGHUP == signal) {
diff --git a/src/unixhelper.h b/src/unixhelper.h
index fab611e..27cb735 100644
--- a/src/unixhelper.h
+++ b/src/unixhelper.h
@@ -17,11 +17,14 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifdef Q_OS_UNIX
#ifndef UNIXHELPER_H
#define UNIXHELPER_H
+#include <QtCore/qglobal.h>
+
+#ifdef Q_OS_UNIX
+
class unixhelper {
public:
unixhelper () {}
@@ -33,6 +36,6 @@ class unixhelper {
void kill_pgroup (int signal);
};
-#endif /* !defined (UNIXHELPER_H) */
-
#endif /* defined (Q_OS_UNIX) */
+
+#endif /* !defined (UNIXHELPER_H) */
--
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