[X2Go-Commits] [x2goclient] 35/142: compat.h: include QtCore/qglobal.h for Q_OS_... macros.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 14 05:09:59 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 1e5b35c925e00887e91be31d19f314303007b192
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Mar 21 23:51:37 2015 +0100
compat.h: include QtCore/qglobal.h for Q_OS_... macros.
---
debian/changelog | 1 +
src/compat.h | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e80b029..d4c4d7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo.
- compat.{cpp,h}: remove inline keyword, because function is not defined
in header file.
+ - compat.h: include QtCore/qglobal.h for Q_OS_... macros.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/src/compat.h b/src/compat.h
index 36b71ef..39da9eb 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -17,10 +17,11 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
#ifndef COMPAT_H
#define COMPAT_H
+#include <QtCore/qglobal.h>
+
#ifdef Q_OS_DARWIN
/*
* strndup() is not available on 10.6 and below, define a compat version here.
--
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