Merge branch '2708-named-doesn-t-compile-with-gcc-10-v9_16' into 'v9_16'

Remove priority from attribute constructor/destructor

See merge request isc-projects/bind9!5104
This commit is contained in:
Ondřej Surý
2021-05-27 12:55:17 +00:00
2 changed files with 6 additions and 6 deletions

View File

@@ -49,11 +49,11 @@
#endif /* __GNUC__ */
#if HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR && HAVE_FUNC_ATTRIBUTE_DESTRUCTOR
#define ISC_CONSTRUCTOR(priority) __attribute__((constructor(priority)))
#define ISC_DESTRUCTOR(priority) __attribute__((destructor(priority)))
#define ISC_CONSTRUCTOR __attribute__((constructor))
#define ISC_DESTRUCTOR __attribute__((destructor))
#elif WIN32
#define ISC_CONSTRUCTOR(priority)
#define ISC_DESTRUCTOR(priority)
#define ISC_CONSTRUCTOR
#define ISC_DESTRUCTOR
#endif
/*%

View File

@@ -35,9 +35,9 @@ isc_lib_register(void) {
}
void
isc__initialize(void) ISC_CONSTRUCTOR(101);
isc__initialize(void) ISC_CONSTRUCTOR;
void
isc__shutdown(void) ISC_DESTRUCTOR(101);
isc__shutdown(void) ISC_DESTRUCTOR;
void
isc__initialize(void) {