[X2Go-Commits] [x2goclient] 01/01: src/x2ogutils.h: guard UNUSED macro definition.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 25 07:44:58 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 6792724a01bf1ed0c54230eb63b78d656eb9c21a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 25 06:35:52 2017 +0100

    src/x2ogutils.h: guard UNUSED macro definition.
---
 debian/changelog |    1 +
 src/x2goutils.h  |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 101079f..d0bb1ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -119,6 +119,7 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       files, coming up next.
     - res/i18n/x2goclient_*.ts: regenerate translation files and fix up some
       SSH and PulseManager messages manually, where possible.
+    - src/x2ogutils.h: guard UNUSED macro definition.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/x2goutils.h b/src/x2goutils.h
index 41099e2..68684f0 100644
--- a/src/x2goutils.h
+++ b/src/x2goutils.h
@@ -23,7 +23,9 @@
 #include <QFont>
 #include <QMessageBox>
 
+#ifndef UNUSED
 #define UNUSED(x) do { (void) x; } while (0)
+#endif
 
 QString expandHome (QString path);
 

--
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