projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #699 from marekbecka/innodb_stats
[collectd.git]
/
src
/
libcollectdclient
/
network_buffer.c
diff --git
a/src/libcollectdclient/network_buffer.c
b/src/libcollectdclient/network_buffer.c
index
acbe93f
..
61c7c22
100644
(file)
--- a/
src/libcollectdclient/network_buffer.c
+++ b/
src/libcollectdclient/network_buffer.c
@@
-54,7
+54,9
@@
/* Re enable deprecation warnings */
# pragma GCC diagnostic warning "-Wdeprecated-declarations"
# endif
/* Re enable deprecation warnings */
# pragma GCC diagnostic warning "-Wdeprecated-declarations"
# endif
+# if GCRYPT_VERSION_NUMBER < 0x010600
GCRY_THREAD_OPTION_PTHREAD_IMPL;
GCRY_THREAD_OPTION_PTHREAD_IMPL;
+# endif
#endif
#include "collectd/network_buffer.h"
#endif
#include "collectd/network_buffer.h"
@@
-131,7
+133,9
@@
static _Bool have_gcrypt (void) /* {{{ */
need_init = 0;
#if HAVE_LIBGCRYPT
need_init = 0;
#if HAVE_LIBGCRYPT
+# if GCRYPT_VERSION_NUMBER < 0x010600
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+# endif
if (!gcry_check_version (GCRYPT_VERSION))
return (0);
if (!gcry_check_version (GCRYPT_VERSION))
return (0);
@@
-146,6
+150,7
@@
static _Bool have_gcrypt (void) /* {{{ */
#endif
} /* }}} _Bool have_gcrypt */
#endif
} /* }}} _Bool have_gcrypt */
+#ifndef HAVE_HTONLL
static uint64_t htonll (uint64_t val) /* {{{ */
{
static int config = 0;
static uint64_t htonll (uint64_t val) /* {{{ */
{
static int config = 0;
@@
-175,6
+180,7
@@
static uint64_t htonll (uint64_t val) /* {{{ */
return ((((uint64_t) lo) << 32) | ((uint64_t) hi));
} /* }}} uint64_t htonll */
return ((((uint64_t) lo) << 32) | ((uint64_t) hi));
} /* }}} uint64_t htonll */
+#endif
static double htond (double val) /* {{{ */
{
static double htond (double val) /* {{{ */
{