aboutsummaryrefslogtreecommitdiff
path: root/Gem
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-12-07 20:42:45 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-12-07 20:42:45 +0000
commite105e52be7eae6e3a5221c20d6e228cb7a59544b (patch)
treef1ef4fe091c6730789aaf721e629963037fcf3cb /Gem
parentd5a7437c186b6e06c79f4634205a26aa07ed981a (diff)
Gem 3985c1f4e4e349d2d84d364f3b36878899d6a364 linux/amd64
built 'master:3985c1f4e4e349d2d84d364f3b36878899d6a364' for linux/amd64
Diffstat (limited to 'Gem')
-rwxr-xr-xGem/Gem.pd_linuxbin32585872 -> 32586048 bytes
-rw-r--r--Gem/develop/include/Gem/Utils/nop.h7
-rwxr-xr-xGem/gem_videoUNICAP.sobin553376 -> 553440 bytes
-rwxr-xr-xGem/gem_videoV4L.sobin479195 -> 479251 bytes
-rwxr-xr-xGem/gem_videoV4L2.sobin603735 -> 603735 bytes
5 files changed, 4 insertions, 3 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux
index 4d0e8e6..d0d9a9b 100755
--- a/Gem/Gem.pd_linux
+++ b/Gem/Gem.pd_linux
Binary files differ
diff --git a/Gem/develop/include/Gem/Utils/nop.h b/Gem/develop/include/Gem/Utils/nop.h
index 8431ef2..75875ef 100644
--- a/Gem/develop/include/Gem/Utils/nop.h
+++ b/Gem/develop/include/Gem/Utils/nop.h
@@ -15,10 +15,11 @@ LOG
#ifndef _INCLUDE__GEM_UTILS_NOP_H_
#define _INCLUDE__GEM_UTILS_NOP_H_
-#if __STDC_VERSION__ >= 199901L
-# define nop(...)
+#if __cplusplus > 199711L || __STDC_VERSION__ >= 199901L
+# define nop(...) do {} while (0)
#else
-# define nop
+static inline void gem__nop(...) { ; }
+# define nop gem__nop
#endif
static inline void gem__nop_post(void) { ; }
diff --git a/Gem/gem_videoUNICAP.so b/Gem/gem_videoUNICAP.so
index ac51af8..82d1054 100755
--- a/Gem/gem_videoUNICAP.so
+++ b/Gem/gem_videoUNICAP.so
Binary files differ
diff --git a/Gem/gem_videoV4L.so b/Gem/gem_videoV4L.so
index dbf1bb7..9030af2 100755
--- a/Gem/gem_videoV4L.so
+++ b/Gem/gem_videoV4L.so
Binary files differ
diff --git a/Gem/gem_videoV4L2.so b/Gem/gem_videoV4L2.so
index 9bf98f7..91df1e3 100755
--- a/Gem/gem_videoV4L2.so
+++ b/Gem/gem_videoV4L2.so
Binary files differ