projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.2' into collectd-4.3
[collectd.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index
a2c4794
..
5c3db5d
100644
(file)
--- a/
src/common.c
+++ b/
src/common.c
@@
-24,6
+24,7
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-556,7
+557,7
@@
long long get_kstat_value (kstat_t *ksp, char *name)
unsigned long long ntohll (unsigned long long n)
{
unsigned long long ntohll (unsigned long long n)
{
-#if
__BYTE_ORDER == __
BIG_ENDIAN
+#if
BYTE_ORDER ==
BIG_ENDIAN
return (n);
#else
return (((unsigned long long) ntohl (n)) << 32) + ntohl (n >> 32);
return (n);
#else
return (((unsigned long long) ntohl (n)) << 32) + ntohl (n >> 32);
@@
-565,7
+566,7
@@
unsigned long long ntohll (unsigned long long n)
unsigned long long htonll (unsigned long long n)
{
unsigned long long htonll (unsigned long long n)
{
-#if
__BYTE_ORDER == __
BIG_ENDIAN
+#if
BYTE_ORDER ==
BIG_ENDIAN
return (n);
#else
return (((unsigned long long) htonl (n)) << 32) + htonl (n >> 32);
return (n);
#else
return (((unsigned long long) htonl (n)) << 32) + htonl (n >> 32);