[X2Go-Commits] [x2goclient] 102/148: pulsemanager.{cpp, h}: fixup preprocessor usage.

git-admin at x2go.org git-admin at x2go.org
Wed May 4 23:28:50 CEST 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 0732df6f50f75866d7c2934aa93e9c975a87b0d8
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Oct 30 02:40:58 2015 +0100

    pulsemanager.{cpp,h}: fixup preprocessor usage.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    8 ++++----
 src/pulsemanager.h   |    4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e29afe..d63967a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -195,6 +195,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.{cpp,h}: add ESD support.
     - pulsemanager.{cpp,h}: rename relaunch () to restart ().
     - pulsemanager.cpp: reformat only.
+    - pulsemanager.{cpp,h}: fixup preprocessor usage.
 
   [ Mike DePaulo ]
   * New upstream release (4.0.5.2):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index d9d5710..9c31cca 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -22,7 +22,7 @@
 #ifndef DEBUG
 #define DEBUG_UNDEF
 #define DEBUG
-#endif
+#endif // defined (NDEBUG)
 
 PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
                                 pulse_port_ (4713),
@@ -62,7 +62,7 @@ void PulseManager::start () {
   start_win ();
 #elif defined (Q_OS_LINUX)
   start_linux ();
-#endif
+#endif // defined (Q_OS_DARWIN)
 }
 
 void PulseManager::start_osx () {
@@ -105,7 +105,7 @@ void PulseManager::start_osx () {
 #ifdef DEBUG
       // Give PA a little time to come up.
       QTimer::singleShot (5000, this, SLOT (slot_play_startup_sound ()));
-#endif
+#endif // defined (DEBUG)
     }
   }
 }
@@ -305,4 +305,4 @@ QProcess::ProcessState PulseManager::state () {
 #ifdef DEBUG_UNDEF
 #undef DEBUG
 #undef DEBUG_UNDEF
-#endif
+#endif // defined (DEBUG_UNDEF)
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index aae71e3..020556a 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -23,7 +23,7 @@
 #ifdef NDEBUG
 #define NDEBUG_DEFINE
 #undef NDEBUG
-#endif
+#endif // defined (NDEBUG)
 
 #include <iostream>
 #include <QDir>
@@ -92,6 +92,6 @@ class PulseManager: public QObject {
 #ifdef NDEBUG_DEFINE
 #define NDEBUG
 #undef NDEBUG_DEFINE
-#endif
+#endif // defined (NDEBUG_DEFINE)
 
 #endif // PULSEMANAGER_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