aboutsummaryrefslogtreecommitdiff
path: root/include/libssh
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2019-12-11 08:40:20 +0100
committerAndreas Schneider <asn@cryptomilk.org>2019-12-11 11:38:16 +0100
commit742d81ec5d966e3617fda8d94fb47efcd6f29ab0 (patch)
tree670a9c78a2083ba3caa74f6369a5ab2d7d9db392 /include/libssh
parentb03818aaedf2a5eb0b78f4ea191de1b1da40adf7 (diff)
downloadlibssh-742d81ec5d966e3617fda8d94fb47efcd6f29ab0.tar.gz
libssh-742d81ec5d966e3617fda8d94fb47efcd6f29ab0.tar.xz
libssh-742d81ec5d966e3617fda8d94fb47efcd6f29ab0.zip
include: Rename __unused__ to __attr_unused__
This avoids a collision with valgrind.h Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Diffstat (limited to 'include/libssh')
-rw-r--r--include/libssh/priv.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 68c67d3e..31405d6b 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -405,20 +405,20 @@ void explicit_bzero(void *s, size_t n);
# endif /* HAVE_FALLTHROUGH_ATTRIBUTE */
#endif /* FALL_THROUGH */
-#ifndef __unused__
+#ifndef __attr_unused__
# ifdef HAVE_UNUSED_ATTRIBUTE
-# define __unused__ __attribute__((unused))
+# define __attr_unused__ __attribute__((unused))
# else /* HAVE_UNUSED_ATTRIBUTE */
-# define __unused__
+# define __attr_unused__
# endif /* HAVE_UNUSED_ATTRIBUTE */
-#endif /* __unused__ */
+#endif /* __attr_unused__ */
#ifndef UNUSED_PARAM
-#define UNUSED_PARAM(param) param __unused__
+#define UNUSED_PARAM(param) param __attr_unused__
#endif /* UNUSED_PARAM */
#ifndef UNUSED_VAR
-#define UNUSED_VAR(var) __unused__ var
+#define UNUSED_VAR(var) __attr_unused__ var
#endif /* UNUSED_VAR */
void ssh_agent_state_free(void *data);