diff options
| author | Toomas Soome <tsoome@me.com> | 2018-11-25 23:51:16 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-12-27 14:49:40 +0200 |
| commit | c3232c9513a02e659ae9307db0fc93d9730704f6 (patch) | |
| tree | 10986f8a0d4f32172d4e5bc0f6b31cd7b4374053 /usr | |
| parent | 88f236be915e7011e2e34d380f6538ccdb24885f (diff) | |
| download | illumos-joyent-c3232c9513a02e659ae9307db0fc93d9730704f6.tar.gz | |
12092 s10_brand: cast between incompatible function types
Reviewed by: Matthias Scheler <mscheler@tintri.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/lib/brand/shared/brand/sys/brand_misc.h | 2 | ||||
| -rw-r--r-- | usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/brand/shared/brand/sys/brand_misc.h b/usr/src/lib/brand/shared/brand/sys/brand_misc.h index 483c8976f1..680d01efa9 100644 --- a/usr/src/lib/brand/shared/brand/sys/brand_misc.h +++ b/usr/src/lib/brand/shared/brand/sys/brand_misc.h @@ -161,7 +161,7 @@ extern "C" { #define brand_assert(ex) (void)((ex) || \ (_brand_abort(0, #ex, __FILE__, __LINE__), 0)) #define brand_abort(err, msg) _brand_abort((err), (msg), __FILE__, __LINE__) -#define EMULATE(cb, args) { (sysent_cb_t)(cb), (args) } +#define EMULATE(cb, args) { (sysent_cb_t)(uintptr_t)(cb), (args) } #define NOSYS EMULATE(brand_unimpl, (0 | RV_DEFAULT)) typedef long (*sysent_cb_t)(); diff --git a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c index 6409c299ca..e854260a30 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c +++ b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c @@ -1695,7 +1695,7 @@ s10_lwp_private(sysret_t *rval, int cmd, int which, uintptr_t base) * Manual," Volume 3A for more details. */ brand_sysent_table[SYS_lwp_create].st_callc = - (sysent_cb_t)s10_lwp_create_correct_fs; + (sysent_cb_t)(uintptr_t)s10_lwp_create_correct_fs; return (__systemcall(rval, SYS_brand + 1024, B_S10_FSREGCORRECTION)); } |