From b35e78fbdbbbe97ae10a41464e32568f6001e06f Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 18 Mar 2016 12:59:03 +0100 Subject: [PATCH] Fix build on Solaris 10 i386 AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS in src/config.h, so we need this header first before including system headers. Thanks to @dago for the report. Fixes: CC collectd-utils_random.o In file included from collectd.h:31:0, from utils_random.c:29: ../../src/config.h:1646:0: error: "_FILE_OFFSET_BITS" redefined [-Werror] #define _FILE_OFFSET_BITS 64 ^ In file included from /opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/pthread.h:20:0, from utils_random.c:27: /opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0: note: this is the location of the previous definition #define _FILE_OFFSET_BITS 32 ^ cc1: all warnings being treated as errors (cherry picked from commit a41f312a8d48a989dfba00a8b43532c60f67caba) --- src/utils_random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils_random.c b/src/utils_random.c index 548d1d81..fee08717 100644 --- a/src/utils_random.c +++ b/src/utils_random.c @@ -24,12 +24,12 @@ * Florian Forster **/ -#include - #include "collectd.h" #include "utils_time.h" #include "utils_random.h" +#include + static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; static _Bool have_seed = 0; -- 2.11.0