Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

This commit is contained in:
Brian Behlendorf 2008-12-05 09:34:04 -08:00
commit b19e8f7318
2 changed files with 17 additions and 1 deletions

View File

@ -251,7 +251,13 @@ uu_release_child(void)
uu_release();
}
#ifdef __GNUC__
static void
uu_init(void) __attribute__((constructor));
#else
#pragma init(uu_init)
#endif
static void
uu_init(void)
{

View File

@ -126,7 +126,13 @@ zfs_share_proto_t share_all_proto[] = {
PROTO_END
};
#ifdef __GNUC__
static void
zfs_iscsi_init(void) __attribute__((constructor));
#else
#pragma init(zfs_iscsi_init)
#endif
static void
zfs_iscsi_init(void)
{
@ -546,8 +552,12 @@ static void (*_sa_update_sharetab_ts)(sa_handle_t);
* values to be used later. This is triggered by the runtime loader.
* Make sure the correct ISA version is loaded.
*/
#ifdef __GNUC__
static void
_zfs_init_libshare(void) __attribute__((constructor));
#else
#pragma init(_zfs_init_libshare)
#endif
static void
_zfs_init_libshare(void)
{