diff -r -u /tmp/opensm-3.3.9/complib/Makefile.in opensm-3.3.9/complib/Makefile.in

--- /tmp/opensm-3.3.9/complib/Makefile.in	Mon Mar  7 00:01:52 2011

+++ opensm-3.3.9/complib/Makefile.in	Mon Mar 14 03:17:52 2011

@@ -239,7 +239,8 @@

 lib_LTLIBRARIES = libosmcomp.la

 @DEBUG_FALSE@DBGFLAGS = -g

 @DEBUG_TRUE@DBGFLAGS = -ggdb -D_DEBUG_

-libosmcomp_la_CFLAGS = -Wall $(DBGFLAGS) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1

+libosmcomp_la_CFLAGS = -Wall $(DBGFLAGS) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 \

+	-D__EXTENSIONS__

 @HAVE_LD_VERSION_SCRIPT_FALSE@libosmcomp_version_script = 

 @HAVE_LD_VERSION_SCRIPT_TRUE@libosmcomp_version_script = -Wl,--version-script=$(srcdir)/libosmcomp.map

 complib_api_version = $(shell grep LIBVERSION= $(srcdir)/libosmcomp.ver | sed 's/LIBVERSION=//')

@@ -343,7 +344,7 @@

 	done; \

 	test -z "$$list2" || { \

 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

 	}

 uninstall-libLTLIBRARIES:

diff -r -u /tmp/opensm-3.3.9/complib/cl_spinlock.c opensm-3.3.9/complib/cl_spinlock.c

--- /tmp/opensm-3.3.9/complib/cl_spinlock.c	Sun Mar  6 23:51:11 2011

+++ opensm-3.3.9/complib/cl_spinlock.c	Mon Mar 14 03:13:30 2011

@@ -63,7 +63,21 @@

 void cl_spinlock_destroy(IN cl_spinlock_t * const p_spinlock)

 {

 	CL_ASSERT(p_spinlock);

+#if !(defined(__SVR4) && defined(__sun))

+/* 

+ * Solaris dumps cores when ibdiagnet is run with any of

+ * these three options: --help, --version, and --vars.

+ * The core dumping seems to be triggered by the "exit 0"

+ * in ibdebug_if.tcl after the appropriate message, such as 

+ * the help message, is printed. The stack trace from the

+ * core dump shows the following CL_ASSERT fails with

+ * p_spinlock->state being 0, an invalid state. It's not

+ * clear why the TCL "exit 0" dumps cores on Solaris but

+ * not on Linux. As a workaround, the CL_ASSERT() is skipped

+ * to avoid dumping cores.

+ */

 	CL_ASSERT(cl_is_state_valid(p_spinlock->state));

+#endif

 	if (p_spinlock->state == CL_INITIALIZED) {

 		p_spinlock->state = CL_UNINITIALIZED;

diff -r -u /tmp/opensm-3.3.9/opensm/osm_qos_policy.c opensm-3.3.9/opensm/osm_qos_policy.c

--- /tmp/opensm-3.3.9/opensm/osm_qos_policy.c	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/opensm/osm_qos_policy.c	Mon Mar 14 03:13:57 2011

@@ -46,7 +46,11 @@

 #include <stdio.h>

 #include <assert.h>

 #include <stdlib.h>

+#if !(defined(__SVR4) && defined(__sun))

 #include <string.h>

+#else

+#include <strings.h>

+#endif

 #include <ctype.h>

 #include <arpa/inet.h>

 #include <opensm/osm_log.h>

diff -r -u /tmp/opensm-3.3.9/opensm/Makefile.am opensm-3.3.9/opensm/Makefile.am

--- /tmp/opensm-3.3.9/opensm/Makefile.am	Sun Mar  6 23:54:55 2011

+++ opensm-3.3.9/opensm/Makefile.am	Mon Mar 14 03:13:52 2011

@@ -25,7 +25,7 @@

 libopensm_la_DEPENDENCIES = $(srcdir)/libopensm.map

 sbin_PROGRAMS = opensm

-opensm_LDFLAGS = -rdynamic

+opensm_LDFLAGS =

 opensm_DEPENDENCIES = libopensm.la

 opensm_SOURCES = main.c osm_console_io.c osm_console.c osm_db_files.c \

 		 osm_db_pack.c osm_drop_mgr.c \

diff -r -u /tmp/opensm-3.3.9/opensm/osm_opensm.c opensm-3.3.9/opensm/osm_opensm.c

--- /tmp/opensm-3.3.9/opensm/osm_opensm.c	Sun Mar  6 23:54:55 2011

+++ opensm-3.3.9/opensm/osm_opensm.c	Mon Mar 14 03:13:56 2011

@@ -46,7 +46,11 @@

 #include <stdio.h>

 #include <stdlib.h>

+#if !(defined(__SVR4) && defined(__sun))

 #include <string.h>

+#else

+#include <strings.h>

+#endif

 #include <complib/cl_dispatcher.h>

 #include <complib/cl_passivelock.h>

 #include <vendor/osm_vendor_api.h>

diff -r -u /tmp/opensm-3.3.9/opensm/Makefile.in opensm-3.3.9/opensm/Makefile.in

--- /tmp/opensm-3.3.9/opensm/Makefile.in	Mon Mar  7 00:01:53 2011

+++ opensm-3.3.9/opensm/Makefile.in	Mon Mar 14 03:17:51 2011

@@ -284,7 +284,8 @@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 INCLUDES = $(OSMV_INCLUDES)

-AM_CFLAGS = -Wall $(DBGFLAGS) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1

+AM_CFLAGS = -Wall $(DBGFLAGS) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 \

+      -D__EXTENSIONS__

 lib_LTLIBRARIES = libopensm.la

 @DEBUG_FALSE@DBGFLAGS = -g

 @DEBUG_TRUE@DBGFLAGS = -ggdb -D_DEBUG_

@@ -296,7 +297,7 @@

 	-export-dynamic $(libopensm_version_script)

 libopensm_la_DEPENDENCIES = $(srcdir)/libopensm.map

-opensm_LDFLAGS = -rdynamic

+opensm_LDFLAGS =

 opensm_DEPENDENCIES = libopensm.la

 opensm_SOURCES = main.c osm_console_io.c osm_console.c osm_db_files.c \

 		 osm_db_pack.c osm_drop_mgr.c \

@@ -436,8 +437,8 @@

 	  else :; fi; \

 	done; \

 	test -z "$$list2" || { \

-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

 	}

 uninstall-libLTLIBRARIES:

diff -r -u /tmp/opensm-3.3.9/opensm/osm_mcast_mgr.c opensm-3.3.9/opensm/osm_mcast_mgr.c

--- /tmp/opensm-3.3.9/opensm/osm_mcast_mgr.c	Sun Mar  6 23:56:08 2011

+++ opensm-3.3.9/opensm/osm_mcast_mgr.c	Mon Mar 14 03:17:13 2011

@@ -751,7 +751,7 @@

 		OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,

 			"MLID 0x%X has %u members - nothing to do\n",

 			mbox->mlid, num_ports);

-		drop_port_list(&port_list);

+				drop_port_list(&port_list);

 		goto Exit;

 	}

diff -r -u /tmp/opensm-3.3.9/opensm/osm_helper.c opensm-3.3.9/opensm/osm_helper.c

--- /tmp/opensm-3.3.9/opensm/osm_helper.c	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/opensm/osm_helper.c	Mon Mar 14 03:13:53 2011

@@ -48,6 +48,7 @@

 #include <stdio.h>

 #include <string.h>

 #include <arpa/inet.h>

+#include <netinet/in.h>

 #include <complib/cl_debug.h>

 #include <iba/ib_types.h>

 #include <opensm/osm_helper.h>

diff -r -u /tmp/opensm-3.3.9/opensm/osm_log.c opensm-3.3.9/opensm/osm_log.c

--- /tmp/opensm-3.3.9/opensm/osm_log.c	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/opensm/osm_log.c	Mon Mar 14 03:13:54 2011

@@ -191,7 +191,7 @@

 		    (result.tm_mon <

 		     12 ? month_str[result.tm_mon] : "???"),

 		    result.tm_mday, result.tm_hour, result.tm_min,

-		    result.tm_sec, usecs, pid, verbosity, buffer);

+		    result.tm_sec, usecs, (int)pid, verbosity, buffer);

 #endif

 	/*  flush log */

diff -r -u /tmp/opensm-3.3.9/opensm/osm_db_files.c opensm-3.3.9/opensm/osm_db_files.c

--- /tmp/opensm-3.3.9/opensm/osm_db_files.c	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/opensm/osm_db_files.c	Mon Mar 14 03:13:53 2011

@@ -375,7 +375,7 @@

 					p_accum_val);

 				/* check that the key is a number */

-				if (!strtouq(p_key, &endptr, 0)

+				if (!strtoull(p_key, &endptr, 0)

 				    && *endptr != '\0') {

 					OSM_LOG(p_log, OSM_LOG_ERROR,

 						"ERR 610B: "

diff -r -u /tmp/opensm-3.3.9/opensm/osm_qos_parser_y.h opensm-3.3.9/opensm/osm_qos_parser_y.h

--- /tmp/opensm-3.3.9/opensm/osm_qos_parser_y.h	Mon Mar  7 00:02:04 2011

+++ opensm-3.3.9/opensm/osm_qos_parser_y.h	Mon Mar 14 03:18:09 2011

@@ -1,23 +1,24 @@

+/* A Bison parser, made by GNU Bison 2.3.  */

-/* A Bison parser, made by GNU Bison 2.4.1.  */

-

 /* Skeleton interface for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

+

+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

    Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

+

+   This program is free software; you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

+   the Free Software Foundation; either version 2, or (at your option)

+   any later version.

+

    This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of

    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    GNU General Public License for more details.

-   

+

    You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

+   along with this program; if not, write to the Free Software

+   Foundation, Inc., 51 Franklin Street, Fifth Floor,

+   Boston, MA 02110-1301, USA.  */

 /* As a special exception, you may create a larger work that contains

    part or all of the Bison parser skeleton and distribute that work

@@ -28,11 +29,10 @@

    special exception, which will cause the skeleton and the resulting

    Bison output files to be licensed under the GNU General Public

    License without this special exception.

-   

+

    This special exception was added by the Free Software Foundation in

    version 2.2 of Bison.  */

-

 /* Tokens.  */

 #ifndef YYTOKENTYPE

 # define YYTOKENTYPE

@@ -198,11 +198,10 @@

 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

 typedef int YYSTYPE;

-# define YYSTYPE_IS_TRIVIAL 1

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

 # define YYSTYPE_IS_DECLARED 1

+# define YYSTYPE_IS_TRIVIAL 1

 #endif

 extern YYSTYPE yylval;

-

diff -r -u /tmp/opensm-3.3.9/libvendor/Makefile.in opensm-3.3.9/libvendor/Makefile.in

--- /tmp/opensm-3.3.9/libvendor/Makefile.in	Mon Mar  7 00:01:52 2011

+++ opensm-3.3.9/libvendor/Makefile.in	Mon Mar 14 03:17:51 2011

@@ -424,8 +424,8 @@

 	  else :; fi; \

 	done; \

 	test -z "$$list2" || { \

-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

 	}

 uninstall-libLTLIBRARIES:

diff -r -u /tmp/opensm-3.3.9/libvendor/osm_vendor_ibumad.c opensm-3.3.9/libvendor/osm_vendor_ibumad.c

--- /tmp/opensm-3.3.9/libvendor/osm_vendor_ibumad.c	Sun Mar  6 23:54:55 2011

+++ opensm-3.3.9/libvendor/osm_vendor_ibumad.c	Mon Mar 14 03:13:49 2011

@@ -265,7 +265,8 @@

 					   &length, -1)) < 0) {

 			if (length <= MAD_BLOCK_SIZE) {

 				OSM_LOG(p_ur->p_log, OSM_LOG_ERROR, "ERR 5404: "

-					"recv error on MAD sized umad (%m)\n");

+					"recv error on MAD sized umad (%s)\n",

+					strerror(errno));

 				continue;

 			} else {

 				umad_free(umad);

@@ -284,8 +285,9 @@

 							   -1)) < 0) {

 					OSM_LOG(p_ur->p_log, OSM_LOG_ERROR,

 						"ERR 5406: "

-						"recv error on umad length %d (%m)\n",

-						length);

+						"recv error on umad length %d "

+						"(%s)\n", length,

+						strerror(errno));

 					continue;

 				}

 			}

@@ -1073,8 +1075,9 @@

 			     resp_expected ? p_bind->timeout : 0,

 			     p_bind->max_retries)) < 0) {

 		OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5430: "

-			"Send p_madw = %p of size %d TID 0x%" PRIx64 " failed %d (%m)\n",

-			p_madw, sent_mad_size, cl_ntoh64(p_mad->trans_id), ret);

+			"Send p_madw = %p of size %d TID 0x%" PRIx64 "" 

+			"failed %d (%s)\n", p_madw, sent_mad_size,

+			cl_ntoh64(p_mad->trans_id), ret, strerror(errno));

 		if (resp_expected) {

 			get_madw(p_vend, &p_mad->trans_id);	/* remove from aging table */

 			p_madw->status = IB_ERROR;

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_map.h opensm-3.3.9/include/complib/cl_map.h

--- /tmp/opensm-3.3.9/include/complib/cl_map.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_map.h	Mon Mar 14 03:13:35 2011

@@ -275,7 +275,11 @@

 	 * The map's pool of map items is the last thing initialized.

 	 * We can therefore use it to test for initialization.

 	 */

+#if !(defined(__SVR4) && defined(__sun))

 	return (cl_is_qpool_inited(&p_map->pool));

+#else

+	return (boolean_t)(cl_is_qpool_inited(&p_map->pool));

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_types.h opensm-3.3.9/include/complib/cl_types.h

--- /tmp/opensm-3.3.9/include/complib/cl_types.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_types.h	Mon Mar 14 03:13:37 2011

@@ -428,8 +428,13 @@

 */

 static inline boolean_t cl_is_state_valid(IN const cl_state_t state)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return ((state == CL_UNINITIALIZED) || (state == CL_INITIALIZED) ||

 		(state == CL_DESTROYING) || (state == CL_DESTROYED));

+#else

+	return (boolean_t)((state == CL_UNINITIALIZED) || (state == CL_INITIALIZED) ||

+		(state == CL_DESTROYING) || (state == CL_DESTROYED));

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_thread_osd.h opensm-3.3.9/include/complib/cl_thread_osd.h

--- /tmp/opensm-3.3.9/include/complib/cl_thread_osd.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_thread_osd.h	Mon Mar 14 03:13:37 2011

@@ -61,7 +61,11 @@

 static inline boolean_t cl_is_blockable(void)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return TRUE;

+#else

+	return ((boolean_t)TRUE);

+#endif

 }

 END_C_DECLS

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_types_osd.h opensm-3.3.9/include/complib/cl_types_osd.h

--- /tmp/opensm-3.3.9/include/complib/cl_types_osd.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_types_osd.h	Mon Mar 14 03:13:37 2011

@@ -72,7 +72,12 @@

 /*

  * Types not explicitly defined are native to the platform.

  */

+#if !(defined(__SVR4) && defined(__sun))

 typedef int boolean_t;

+#else

+#include <infiniband/ofa_solaris.h>

+#endif

+

 typedef volatile int32_t atomic32_t;

 #ifndef NULL

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_qlist.h opensm-3.3.9/include/complib/cl_qlist.h

--- /tmp/opensm-3.3.9/include/complib/cl_qlist.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_qlist.h	Mon Mar 14 03:13:36 2011

@@ -508,7 +508,11 @@

 	/* CL_ASSERT that the list was initialized. */

 	CL_ASSERT(p_list->state == CL_INITIALIZED);

+#if !(defined(__SVR4) && defined(__sun))

 	return (!cl_qlist_count(p_list));

+#else

+	return (boolean_t)(!cl_qlist_count(p_list));

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_byteswap_osd.h opensm-3.3.9/include/complib/cl_byteswap_osd.h

--- /tmp/opensm-3.3.9/include/complib/cl_byteswap_osd.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_byteswap_osd.h	Mon Mar 14 03:13:33 2011

@@ -44,8 +44,12 @@

 /*

  * This provides defines __LITTLE_ENDIAN, __BIG_ENDIAN and __BYTE_ORDER

  */

+#if !(defined(__SVR4) && defined(__sun))

 #include <endian.h>

 #include <byteswap.h>

+#else

+#include <infiniband/ofa_solaris.h>

+#endif

 #ifdef __cplusplus

 #  define BEGIN_C_DECLS extern "C" {

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_debug_osd.h opensm-3.3.9/include/complib/cl_debug_osd.h

--- /tmp/opensm-3.3.9/include/complib/cl_debug_osd.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_debug_osd.h	Mon Mar 14 03:13:34 2011

@@ -42,7 +42,6 @@

 #define _CL_DEBUG_OSD_H_

 #include <complib/cl_types.h>

-#include <bits/wordsize.h>

 #ifdef __cplusplus

 #  define BEGIN_C_DECLS extern "C" {

diff -r -u /tmp/opensm-3.3.9/include/complib/cl_qmap.h opensm-3.3.9/include/complib/cl_qmap.h

--- /tmp/opensm-3.3.9/include/complib/cl_qmap.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/complib/cl_qmap.h	Mon Mar 14 03:13:36 2011

@@ -346,7 +346,11 @@

 	CL_ASSERT(p_map);

 	CL_ASSERT(p_map->state == CL_INITIALIZED);

+#if !(defined(__SVR4) && defined(__sun))

 	return (p_map->count == 0);

+#else

+	return (boolean_t)(p_map->count == 0);

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/opensm/osm_madw.h opensm-3.3.9/include/opensm/osm_madw.h

--- /tmp/opensm-3.3.9/include/opensm/osm_madw.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/opensm/osm_madw.h	Mon Mar 14 03:13:40 2011

@@ -489,7 +489,11 @@

 	p_madw->mad_size = mad_size;

 	if (p_mad_addr)

 		p_madw->mad_addr = *p_mad_addr;

+#if !(defined(__SVR4) && defined(__sun))

 	p_madw->resp_expected = FALSE;

+#else

+	p_madw->resp_expected = (boolean_t)FALSE;

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/opensm/osm_log.h opensm-3.3.9/include/opensm/osm_log.h

--- /tmp/opensm-3.3.9/include/opensm/osm_log.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/opensm/osm_log.h	Mon Mar 14 03:13:40 2011

@@ -355,7 +355,11 @@

 static inline boolean_t osm_log_is_active(IN const osm_log_t * p_log,

 					  IN osm_log_level_t level)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return ((p_log->level & level) != 0);

+#else

+	return (boolean_t)((p_log->level & level) != 0);

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/opensm/osm_helper.h opensm-3.3.9/include/opensm/osm_helper.h

--- /tmp/opensm-3.3.9/include/opensm/osm_helper.h	Sun Mar  6 23:51:12 2011

+++ opensm-3.3.9/include/opensm/osm_helper.h	Mon Mar 14 03:13:39 2011

@@ -182,7 +182,11 @@

 */

 static inline boolean_t ib_gid_is_notzero(IN const ib_gid_t * p_gid)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return memcmp(p_gid, &ib_zero_gid, sizeof(*p_gid));

+#else

+	return (boolean_t)memcmp(p_gid, &ib_zero_gid, sizeof(*p_gid));

+#endif

 }

 /*

diff -r -u /tmp/opensm-3.3.9/include/iba/ib_types.h opensm-3.3.9/include/iba/ib_types.h

--- /tmp/opensm-3.3.9/include/iba/ib_types.h	Sun Mar  6 23:54:55 2011

+++ opensm-3.3.9/include/iba/ib_types.h	Mon Mar 14 03:13:38 2011

@@ -578,8 +578,13 @@

 static inline boolean_t OSM_API

 ib_class_is_vendor_specific_low(IN const uint8_t class_code)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return ((class_code >= IB_MCLASS_VENDOR_LOW_RANGE_MIN) &&

 		(class_code <= IB_MCLASS_VENDOR_LOW_RANGE_MAX));

+#else

+	return (boolean_t)((class_code >= IB_MCLASS_VENDOR_LOW_RANGE_MIN) &&

+		(class_code <= IB_MCLASS_VENDOR_LOW_RANGE_MAX));

+#endif

 }

 /*

@@ -610,8 +615,13 @@

 static inline boolean_t OSM_API

 ib_class_is_vendor_specific_high(IN const uint8_t class_code)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return ((class_code >= IB_MCLASS_VENDOR_HIGH_RANGE_MIN) &&

 		(class_code <= IB_MCLASS_VENDOR_HIGH_RANGE_MAX));

+#else

+	return (boolean_t)((class_code >= IB_MCLASS_VENDOR_HIGH_RANGE_MIN) &&

+		(class_code <= IB_MCLASS_VENDOR_HIGH_RANGE_MAX));

+#endif

 }

 /*

@@ -641,8 +651,13 @@

 static inline boolean_t OSM_API

 ib_class_is_vendor_specific(IN const uint8_t class_code)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return (ib_class_is_vendor_specific_low(class_code) ||

 		ib_class_is_vendor_specific_high(class_code));

+#else

+	return (boolean_t)(ib_class_is_vendor_specific_low(class_code) ||

+		ib_class_is_vendor_specific_high(class_code));

+#endif

 }

 /*

@@ -671,11 +686,19 @@

 */

 static inline boolean_t OSM_API ib_class_is_rmpp(IN const uint8_t class_code)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return ((class_code == IB_MCLASS_SUBN_ADM) ||

 		(class_code == IB_MCLASS_DEV_MGMT) ||

 		(class_code == IB_MCLASS_DEV_ADM) ||

 		(class_code == IB_MCLASS_BIS) ||

 		ib_class_is_vendor_specific_high(class_code));

+#else

+	return (boolean_t)((class_code == IB_MCLASS_SUBN_ADM) ||

+		(class_code == IB_MCLASS_DEV_MGMT) ||

+		(class_code == IB_MCLASS_DEV_ADM) ||

+		(class_code == IB_MCLASS_BIS) ||

+		ib_class_is_vendor_specific_high(class_code));

+#endif

 }

 /*

@@ -2186,7 +2209,11 @@

 */

 static inline boolean_t OSM_API ib_pkey_is_full_member(IN const ib_net16_t pkey)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return ((pkey & IB_PKEY_TYPE_MASK) == IB_PKEY_TYPE_MASK);

+#else

+	return (boolean_t)((pkey & IB_PKEY_TYPE_MASK) == IB_PKEY_TYPE_MASK);

+#endif

 }

 /*

@@ -2217,7 +2244,11 @@

 */