Code

Fix make check on OmniOS
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 14:24:16 +0000 (15:24 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 14:35:40 +0000 (15:35 +0100)
commit40714ee7451460ff5192f49bcc324e3d9a6f0d7f
treef52481a3d990bc8feddafa9d9e7c2844c9bdc8ad
parent090e054043f6d93b374dee20d766c4f906acd43a
Fix make check on OmniOS

We need the defines from config.h before
we include <testing.h>, or we get the following error on OmniOS:

make  test_common test_meta_data  test_utils_avltree test_utils_heap  test_utils_time test_utils_subst
gcc -DHAVE_CONFIG_H -I. -I../../src  -I../../src -DPREFIX='"/opt/collectd"'  -DCONFIGFILE='"/opt/collectd/etc/collectd.conf"'  -DLOCALSTATEDIR='"/opt/collectd/var"'  -DPKGLOCALSTATEDIR='"/opt/collectd/var/lib/collectd"'  -DPIDFILE='"/opt/collectd/var/run/collectd.pid"' -DPLUGINDIR='"/opt/collectd/lib/collectd"'  -DPKGDATADIR='"/opt/collectd/share/collectd"'   -Wall -Werror -g -O2 -c -o common_test.o common_test.c
In file included from collectd.h:31:0,
                 from common.h:31,
                 from common_test.c:28:
../../src/config.h:1631:0: error: "_FILE_OFFSET_BITS" redefined [-Werror]
 #define _FILE_OFFSET_BITS 64
 ^
In file included from /usr/include/inttypes.h:41:0,
                 from ../../src/testing.h:30,
                 from common_test.c:27:
/opt/gcc-5.1.0/lib/gcc/i386-pc-solaris2.11/5.1.0/include-fixed/sys/feature_tests.h:231:0: note: this is the location of the previous definition
 #define _FILE_OFFSET_BITS 32
 ^
cc1: all warnings being treated as errors
*** Error code 1
make: Fatal error: Command failed for target `common_test.o'
src/daemon/common_test.c
src/daemon/meta_data_test.c
src/daemon/utils_avltree_test.c
src/daemon/utils_heap_test.c
src/daemon/utils_subst_test.c
src/daemon/utils_time_test.c
src/utils_latency_test.c
src/utils_mount_test.c
src/utils_vl_lookup_test.c