--- old/usr/src/common/nvpair/nvpair.c	2013-09-05 23:02:07.732633093 +0400
+++ new/usr/src/common/nvpair/nvpair.c	2013-09-05 23:02:07.154134237 +0400
@@ -44,8 +44,12 @@
 #endif
 
 #ifndef	offsetof
+#if defined(__GNUC__)
+#define	offsetof(s, m)	__builtin_offsetof(s, m)
+#else
 #define	offsetof(s, m)	((size_t)(&(((s *)0)->m)))
 #endif
+#endif
 #define	skip_whitespace(p)	while ((*(p) == ' ') || (*(p) == '\t')) p++
 
 /*