]> granicus.if.org Git - zfs/commitdiff
Fix gcc init pragma warnings
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 26 Aug 2010 16:52:40 +0000 (09:52 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 27 Aug 2010 22:34:02 +0000 (15:34 -0700)
Use constructor attribute on non-Solaris platforms.

The #pragma init/fini ->__attribute__((constructor/destructor))
conversions, these should go upstream.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
lib/libuutil/uu_misc.c
lib/libzfs/libzfs_mount.c

index 66a6ca5694db501805321e519ef8abd136c449ea..578bf32940520349f8b3756ca7a012a8b131d79f 100644 (file)
@@ -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)
 {
index 922220620464b692d311a32a665afedeff2185a3..c31a123712c3ecedca01667910090a180b1aca57 100644 (file)
@@ -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)
 {