diff options
| author | Patrik Nyblom <[email protected]> | 2012-04-18 11:56:19 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-18 11:56:19 +0200 |
| commit | cff02d4925bfd6ed88d9d7b897f4b4416e4643ce (patch) | |
| tree | edb748eddafa80d084cf5ef271d68b042d8f0a80 /erts/emulator/beam/global.h | |
| parent | 00668f8cbae565d482e9ad72a63f846cef8e8071 (diff) | |
| parent | a76628f8f0de895e318c11585a53983e476d692c (diff) | |
| download | otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.gz otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.bz2 otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.zip | |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x[-rw-r--r--] | erts/emulator/beam/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 84267dd140..c1be206b90 100644..100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -174,6 +174,7 @@ struct port { char *name; /* String used in the open */ erts_driver_t* drv_ptr; UWord drv_data; + 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)*/ |