From: Bartosz Golaszewski Date: Thu, 26 Jun 2014 12:31:05 +0000 (+0200) Subject: Rename INIT_LAST to INIT_FUNC to avoid confusion X-Git-Tag: 1_23_0~85 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bf0f2c7aa6ab5c33c05b4620a6bfa286bd38c9f9;p=oweals%2Fbusybox.git Rename INIT_LAST to INIT_FUNC to avoid confusion We don't have an INIT_FIRST, so let's rename INIT_LAST to INIT_FUNC to imply that the function is called at program start-up. Also: the priority argument for __attribute__((constructor)) isn't used, so let's remove it. Signed-off-by: Bartosz Golaszewski Signed-off-by: Denys Vlasenko --- diff --git a/include/libbb.h b/include/libbb.h index cede50cc2..858084bc5 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1960,7 +1960,7 @@ void bbunit_settestfailed(void); .name = #NAME, \ .testfunc = bbunit_##NAME##_test, \ }; \ - static void INIT_LAST bbunit_##NAME##_register(void) \ + static void INIT_FUNC bbunit_##NAME##_register(void) \ { \ bbunit_registertest(&bbunit_##NAME##_elem); \ } \ diff --git a/include/platform.h b/include/platform.h index 413c2224c..09c7ccd9c 100644 --- a/include/platform.h +++ b/include/platform.h @@ -76,8 +76,8 @@ # define UNUSED_PARAM_RESULT #endif -/* used by unit test machinery to run registration functions */ -#define INIT_LAST __attribute__ ((constructor(2000))) +/* used by unit test machinery to run registration functions before calling main() */ +#define INIT_FUNC __attribute__ ((constructor)) /* -fwhole-program makes all symbols local. The attribute externally_visible * forces a symbol global. */