Merge pull request #3329 from efuss/fix-3311

[collectd.git] / src / daemon / globals.c

diff --git a/src/daemon/globals.c b/src/daemon/globals.c
index 9b0aec7..85f1b11 100644 (file)
--- a/src/daemon/globals.c
+++ b/src/daemon/globals.c
@@ -21,8 +21,14 @@
  * DEALINGS IN THE SOFTWARE.
  **/
 
-#include "common.h"
+// 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"
+// clang-format on
 
 #if HAVE_KSTAT_H
 #include <kstat.h>
@@ -33,17 +39,16 @@
  */
 char *hostname_g;
 cdtime_t interval_g;
-int  timeout_g;
+int timeout_g;
 #if HAVE_KSTAT_H
 kstat_ctl_t *kc;
 #endif
 
 void hostname_set(char const *hostname) {
-    char *h = strdup(hostname);
-      if (h == NULL)
-            return;
+  char *h = strdup(hostname);
+  if (h == NULL)
+    return;
 
-        free(hostname_g);
-          hostname_g = h;
+  sfree(hostname_g);
+  hostname_g = h;
 }
-