[X2Go-Commits] [x2goclient] 200/281: src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint otherwise.

[git-admin at x2go.org]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit c1d7d29cb57e4398e187744ab70644a105c3783d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jul 4 05:06:28 2016 +0200

    src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint otherwise.
---
 debian/changelog   |    2 ++
 src/pulsemanager.h |    5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7f218ee..2496023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -363,6 +363,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/: new file windows_stdint.h for Windows-compatibility when using
       std::(u)int*_t types. These are only available with GCC in C++11 mode on
       Windows for some reason.
+    - src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint
+      otherwise.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 6e39b9a..ff541cb 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -30,7 +30,12 @@
 #include <QApplication>
 #include <QTimer>
 #include <assert.h>
+
+#ifdef Q_OS_WIN
+#include "windows_stdint.h"
+#else /* defined (Q_OS_WIN) */
 #include <cstdint>
+#endif /* defined (Q_OS_WIN) */
 
 #include "x2gosettings.h"
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git