diff options
| author | Brian Behlendorf <[email protected]> | 2010-08-26 09:52:40 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-08-27 15:34:02 -0700 |
| commit | 0ccd9d24e4fdbe9cd07f838d0a62083e8eca95f2 (patch) | |
| tree | 0e32b4e0d661f90769556f9570d6f2c204e3902e | |
| parent | e5dc681a50a41d42c18b52abc8d5a3c2a357bdaa (diff) | |
Fix gcc init pragma warnings
Use constructor attribute on non-Solaris platforms.
The #pragma init/fini ->__attribute__((constructor/destructor))
conversions, these should go upstream.
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | lib/libuutil/uu_misc.c | 6 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_mount.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/libuutil/uu_misc.c b/lib/libuutil/uu_misc.c index 66a6ca569..578bf3294 100644 --- a/lib/libuutil/uu_misc.c +++ b/lib/libuutil/uu_misc.c @@ -249,7 +249,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) { diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c index 922220620..c31a12371 100644 --- a/lib/libzfs/libzfs_mount.c +++ b/lib/libzfs/libzfs_mount.c @@ -518,8 +518,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) { |