Add standard include early or _FILE_OFFSET_BITS will have definition mismatches on...

(cherry picked from commit 54d4f889eb72249824ef4ee6b155b0e0fb858be2)

diff --git a/src/daemon/globals.c b/src/daemon/globals.c
index a76a44c..5409294 100644 (file)
--- a/src/daemon/globals.c
+++ b/src/daemon/globals.c
@@ -21,8 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  **/
 
-#include "globals.h"
 #include "utils/common/common.h"
+#include "globals.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/utils/cmds/cmds_test.c b/src/utils/cmds/cmds_test.c
index 713f032..c0602e6 100644 (file)
--- a/src/utils/cmds/cmds_test.c
+++ b/src/utils/cmds/cmds_test.c
@@ -24,9 +24,9 @@
  *   Sebastian 'tokkee' Harl <sh at tokkee.org>
  **/
 
+#include "utils/common/common.h"
 #include "testing.h"
 #include "utils/cmds/cmds.h"
-#include "utils/common/common.h"
 
 static void error_cb(void *ud, cmd_status_t status, const char *format,
                      va_list ap) {

diff --git a/src/utils/common/common_test.c b/src/utils/common/common_test.c
index 426082f..0be8ddd 100644 (file)
--- a/src/utils/common/common_test.c
+++ b/src/utils/common/common_test.c
@@ -24,8 +24,8 @@
  *   Florian octo Forster <octo at collectd.org>
  */
 
-#include "testing.h"
 #include "utils/common/common.h"
+#include "testing.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/utils/proc_pids/proc_pids_test.c b/src/utils/proc_pids/proc_pids_test.c
index 06b8d39..2693b1f 100644 (file)
--- a/src/utils/proc_pids/proc_pids_test.c
+++ b/src/utils/proc_pids/proc_pids_test.c
@@ -1,5 +1,5 @@
-#include "testing.h"
 #include "utils/proc_pids/proc_pids.c" /* sic */
+#include "testing.h"
 #include <sys/stat.h>
 
 /***************************************************************************