PERFORCE change 110909 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=110909

Change 110909 by jb at jb_freebsd8 on 2006/12/03 01:23:08

	Reset to match OpenSolaris sources.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#6 (text) ====

@@ -27,11 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
-#if defined(sun)
 #include <sys/sysmacros.h>
-#else
-#define	MIN(a, b)	((a) < (b) ? (a) : (b))
-#endif
 #include <strings.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -209,7 +205,7 @@
 
 ssize_t
 strtab_write(const strtab_t *sp,
-    STRTAB_COPY_FUNC func, void *priv)
+    ssize_t (*func)(const void *, size_t, void *), void *priv)
 {
 	ssize_t res, total = 0;
 	ulong_t i;