projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-Merge pull request #3203 from dago/netsnmpagent
[collectd.git]
/
src
/
daemon
/
globals.c
diff --git
a/src/daemon/globals.c
b/src/daemon/globals.c
index
3d3c7ab
..
85f1b11
100644
(file)
--- a/
src/daemon/globals.c
+++ b/
src/daemon/globals.c
@@
-21,8
+21,14
@@
* DEALINGS IN THE SOFTWARE.
**/
* DEALINGS IN THE SOFTWARE.
**/
+// clang-format off
+/*
+ * Explicit order is required or _FILE_OFFSET_BITS will have definition mismatches on Solaris
+ * See Github Issue #3193 for details
+ */
+#include "utils/common/common.h"
#include "globals.h"
#include "globals.h"
-#include "common.h"
+// clang-format on
#if HAVE_KSTAT_H
#include <kstat.h>
#if HAVE_KSTAT_H
#include <kstat.h>
@@
-43,6
+49,6
@@
void hostname_set(char const *hostname) {
if (h == NULL)
return;
if (h == NULL)
return;
- free(hostname_g);
+
s
free(hostname_g);
hostname_g = h;
}
hostname_g = h;
}