diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-20 15:44:01 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-09-20 12:53:55 +0300 |
| commit | b79609a5823c681de453be676098d9635305e6a7 (patch) | |
| tree | f8acaa81b48721aaa0319dd5494cc8714abe93fe | |
| parent | d1704f8ef75a0e4e2dff36192648884817b6f076 (diff) | |
| download | illumos-joyent-b79609a5823c681de453be676098d9635305e6a7.tar.gz | |
11591 usbser: cast between incompatible function types
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Aurélien Larcher <aurelien.larcher@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/sys/usb/clients/usbser/usbser_rseq.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/usb/clients/usbser/usbser_rseq.h b/usr/src/uts/common/sys/usb/clients/usbser/usbser_rseq.h index 4a9dc9e6bb..42652adee2 100644 --- a/usr/src/uts/common/sys/usb/clients/usbser/usbser_rseq.h +++ b/usr/src/uts/common/sys/usb/clients/usbser/usbser_rseq.h @@ -142,7 +142,8 @@ enum { /* * convenience macros for rseq definition */ -#define RSEQT(func, cb) { (rseq_func_t)(func), #func, (rseq_cb_t)(cb), 0 } +#define RSEQT(func, cb) { (rseq_func_t)(uintptr_t)(func), #func, \ + (rseq_cb_t)(uintptr_t)(cb), 0 } #define RSEQE(f1, cb1, f2, cb2) { RSEQT(f1, cb1), RSEQT(f2, cb2) } /* @@ -157,7 +158,7 @@ enum { * }; * * int my_do_cb(rseq_t *rseq, int num) - * { return (rseq[num].rval == 0) ? RSEQ_OK : RSEQ_UNDO; } + * { return (rseq[num].rval == 0) ? RSEQ_OK : RSEQ_UNDO; } * * int my_undo_cb(rseq_t *rseq, int num) * { return RSEQ_OK; } |