From fedfcdee6f55c3f183752b7fac4879bf41eed60b Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 31 Oct 2014 10:07:54 -0400 Subject: Make bus errno mappings non-static __attribute__((used)) is not enough to force static variables to be carried over to a compiled program from a library. Mappings defined in libsystemd-shared.a were not visible in the compiled binaries. To ensure that the mappings are present in the final binary, the tables are made non-static and are given a real unique name by which they can be referenced. To use a mapping defined not in the local compilation unit (e.g. in a library) a reference to the mapping table is added. This is done by including a declaration in the header file. Expected values in test-engine are fixed to reflect the new mappings. --- src/timedate/timedated.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/timedate/timedated.c') diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 49a957c8d0..e720227338 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -44,7 +44,7 @@ #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n" #define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n" -SD_BUS_ERROR_MAPPING = { +SD_BUS_ERROR_MAPPING(timedated) = { {"org.freedesktop.timedate1.NoNTPSupport", ENOTSUP}, }; -- cgit v1.2.3-54-g00ecf