PERFORCE change 100913 for review

[John Birrell]

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

Change 100913 by jb at jb_freebsd2 on 2006/07/07 18:46:22

	Use u_long arg to ioctl to avoid sign-extension on 64-bit architectures.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#10 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#10 (text) ====

@@ -560,7 +560,11 @@
 extern void dt_set_errmsg(dtrace_hdl_t *, const char *, const char *,
     const char *, int, const char *, va_list);
 
+#if defined(sun)
 extern int dt_ioctl(dtrace_hdl_t *, int, void *);
+#else
+extern int dt_ioctl(dtrace_hdl_t *, u_long, void *);
+#endif
 extern int dt_status(dtrace_hdl_t *, processorid_t);
 extern long dt_sysconf(dtrace_hdl_t *, int);
 extern ssize_t dt_write(dtrace_hdl_t *, int, const void *, size_t);

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 (text) ====

@@ -521,7 +521,11 @@
  * entry point to obtain a library handle.
  */
 struct dtrace_vector {
+#if defined(sun)
 	int (*dtv_ioctl)(void *, int, void *);
+#else
+	int (*dtv_ioctl)(void *, u_long, void *);
+#endif
 	int (*dtv_lookup_by_addr)(void *, GElf_Addr, GElf_Sym *,
 	    dtrace_syminfo_t *);
 	int (*dtv_status)(void *, processorid_t);