Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
parent e9f74d2295 3dce9c0ff7
commit b19e8f7318
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zfs/lib/libuutil/uu_misc.c
View File

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

12
zfs/lib/libzfs/libzfs_mount.c
View File

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