This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 94e366dc4bea5fed73000eb52ad4261f40d855b4
Author: Mihai Moldovan <io...@ionic.de>
Date: Sat Mar 21 23:40:41 2015 +0100
compat.{cpp,h}: remove inline keyword, because function is not defined in
header file.
---
debian/changelog | 2 ++
src/compat.cpp | 2 +-
src/compat.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 529e7a6..05bb5d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
file. Generalize some Windows-specific sections by using QDir and QFile.
- compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below.
Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo.
+ - compat.{cpp,h}: remove inline keyword, because function is not defined
+ in header file.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/compat.cpp b/src/compat.cpp
index 877d07b..c443489 100644
--- a/src/compat.cpp
+++ b/src/compat.cpp
@@ -29,7 +29,7 @@
#include <string.h>
#include <stdlib.h>
-inline char *strndup (const char *s, size_t n) {
+char *strndup (const char *s, size_t n) {
char *result;
size_t len = strlen (s);
diff --git a/src/compat.h b/src/compat.h
index 8b9d77e..36b71ef 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -31,7 +31,7 @@
#include <string.h>
#include <stdlib.h>
-inline char *strndup (const char *s, size_t n);
+char *strndup (const char *s, size_t n);
#endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
#endif /* defined (Q_OS_DARWIN) */
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
