diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-16 17:59:00 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-17 16:12:54 +0200 |
| commit | 3985e56bfa82083b23978e06809b8ab0cf9d52d8 (patch) | |
| tree | 629673d880c219f43d5ec8739cfb512eee9b6276 /erts/emulator/beam | |
| parent | e2277e240790930563b0833854e7bc6a8338cf5c (diff) | |
| download | otp-3985e56bfa82083b23978e06809b8ab0cf9d52d8.tar.gz otp-3985e56bfa82083b23978e06809b8ab0cf9d52d8.tar.bz2 otp-3985e56bfa82083b23978e06809b8ab0cf9d52d8.zip | |
Make port_info(Port,os_pid) work on Windows
Diffstat (limited to 'erts/emulator/beam')
| -rwxr-xr-x[-rw-r--r--] | erts/emulator/beam/erl_bif_info.c | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | erts/emulator/beam/global.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 4dcfe997d4..2373dc7af4 100644..100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -2927,10 +2927,10 @@ static BIF_RETTYPE port_info(Process* p, Eterm portid, Eterm item) else if (item == am_os_pid) { if (prt->os_pid >= 0) { Uint hsz = 3; - Uint n = prt->os_pid; - (void) erts_bld_uint(NULL, &hsz, n); + UWord n = prt->os_pid; + (void) erts_bld_uword(NULL, &hsz, n); hp = HAlloc(p, hsz); - res = erts_bld_uint(&hp, NULL, n); + res = erts_bld_uword(&hp, NULL, n); } else { hp = HAlloc(p, 3); res = am_undefined; diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 9f99afd641..894872dbc0 100644..100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -173,7 +173,7 @@ struct port { char *name; /* String used in the open */ erts_driver_t* drv_ptr; UWord drv_data; - pid_t os_pid; /* Child process ID */ + SWord os_pid; /* Child process ID */ ErtsProcList *suspended; /* List of suspended processes. */ LineBuf *linebuf; /* Buffer to hold data not ready for process to get (line oriented I/O)*/ |