aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-03-12 16:09:26 +0100
committerPatrik Nyblom <[email protected]>2010-03-12 16:09:26 +0100
commit24095d93fb28bdd60abe771a426e39c6ff0f72c7 (patch)
tree39db453548450175fe1dcd3a78642c496b637285
parent58bf309625bb2fc99a7689d3ce2dcb6de2a3a04c (diff)
downloadotp-24095d93fb28bdd60abe771a426e39c6ff0f72c7.tar.gz
otp-24095d93fb28bdd60abe771a426e39c6ff0f72c7.tar.bz2
otp-24095d93fb28bdd60abe771a426e39c6ff0f72c7.zip
Teach testcase in driver_suite the new prototype for driver_async
The testcase core dunmped. Also made sure the key could actually store long integers in driver_async (which is more of a cosmetic change).
-rw-r--r--erts/emulator/beam/erl_async.c2
-rw-r--r--erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index ef9644c3d1..05b7d6a4fa 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -397,7 +397,7 @@ long driver_async(ErlDrvPort ix, unsigned long* key,
ErlAsync* a = (ErlAsync*) erts_alloc(ERTS_ALC_T_ASYNC, sizeof(ErlAsync));
Port* prt = erts_drvport2port(ix);
long id;
- unsigned int qix;
+ unsigned long qix;
if (!prt)
diff --git a/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c b/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
index f429a5b51e..2ac86b1ec2 100644
--- a/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
@@ -127,7 +127,7 @@ static int control(ErlDrvData drv_data,
char **rbuf, int rlen)
{
PeekNonXQDrvData *dp = (PeekNonXQDrvData *) drv_data;
- unsigned int key = 0;
+ unsigned long key = 0;
char *res_str = "ok";
ErlDrvSysInfo si;
driver_system_info(&si, sizeof(ErlDrvSysInfo));