795 diff -r -u /tmp/infiniband-diags-1.5.8/libibnetdisc/src/internal.h infiniband-diags-1.5.8/libibnetdisc/src/internal.h

   796 --- /tmp/infiniband-diags-1.5.8/libibnetdisc/src/internal.h	Wed Feb 16 02:13:21 2011

   797 +++ infiniband-diags-1.5.8/libibnetdisc/src/internal.h	Fri Dec 13 11:55:25 2013

   798 @@ -41,12 +41,56 @@

   799  #include <infiniband/ibnetdisc.h>

   800  #include <complib/cl_qmap.h>

   801  

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

   803 +#include <sys/varargs.h>

   804 +

   805 +static inline void

   806 +ibnd_msg_internal(FILE *fd, const char *format, va_list alist)

   807 +{

   808 +	const char	*filename;

   809 +	char		*filename_p;

   810 +	char		*format_p = format;

   811 +

   812 +	/*

   813 +	 * The filename returned by va_arg() has the full path. Skip "%s"

   814 +	 * from format="%s:%u; " and truncate full pathname of src file to

   815 +	 * start with infiniband-diags.

   816 +	 */

   817 +	filename = va_arg(alist, const char *);

   818 +	format_p += 2;

   819 +	if ((filename_p = strstr(filename, "infiniband-diags-")) != NULL) {

   820 +		(void) fprintf(fd, "%s", filename_p);

   821 +		(void) vfprintf(fd, format_p, alist);

   822 +	} else {

   823 +		(void) fprintf(fd, "%s", filename);

   824 +		(void) vfprintf(fd, format_p, alist);

   825 +	}

   826 +}

   827 +

   828 +static inline void

   829 +ibnd_msg(FILE *fd, const char *format, ...)

   830 +{

   831 +	va_list alist;

   832 +

   833 +	va_start(alist, format);

   834 +	ibnd_msg_internal(fd, format, alist);

   835 +	va_end(alist);

   836 +}

   837 +

   838  #define	IBND_DEBUG(fmt, ...) \

   839  	if (ibdebug) { \

   840 +		ibnd_msg(stdout, "%s:%u; " fmt, __FILE__, __LINE__, ## __VA_ARGS__); \

   841 +	}

   842 +#define	IBND_ERROR(fmt, ...) \

   843 +		ibnd_msg(stderr, "%s:%u; " fmt, __FILE__, __LINE__, ## __VA_ARGS__)

   844 +#else

   845 +#define	IBND_DEBUG(fmt, ...) \

   846 +	if (ibdebug) { \

   847  		printf("%s:%u; " fmt, __FILE__, __LINE__, ## __VA_ARGS__); \

   848  	}

   849  #define	IBND_ERROR(fmt, ...) \

   850  		fprintf(stderr, "%s:%u; " fmt, __FILE__, __LINE__, ## __VA_ARGS__)

   851 +#endif

   852  

   853  /* HASH table defines */

   854  #define HASHGUID(guid) ((uint32_t)(((uint32_t)(guid) * 101) ^ ((uint32_t)((guid) >> 32) * 103)))