diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /hurd | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/console.h | 2 | ||||
| -rw-r--r-- | hurd/default_pager.defs | 1 | ||||
| -rw-r--r-- | hurd/hurd_types.h | 2 | ||||
| -rw-r--r-- | hurd/io.defs | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/hurd/console.h b/hurd/console.h index 4634cc28..baf03942 100644 --- a/hurd/console.h +++ b/hurd/console.h @@ -122,7 +122,7 @@ struct cons_display ever increased by the server, so clients can optimize scrolling. */ uint32_t scr_lines; /* Number of lines in scrollback buffer - preceeding CUR_LINE. */ + preceding CUR_LINE. */ uint32_t height; /* Number of lines in visible area following (and including) CUR_LINE. */ uint32_t matrix; /* Index (in uint32_t) of the beginning of diff --git a/hurd/default_pager.defs b/hurd/default_pager.defs index 7b1549a0..8ad82dcc 100644 --- a/hurd/default_pager.defs +++ b/hurd/default_pager.defs @@ -91,6 +91,5 @@ routine default_pager_paging_storage( will fail. */ routine default_pager_object_set_size( memory_object : mach_port_t; - sreplyport reply_port : mach_port_send_once_t; msgseqno seqno : mach_port_seqno_t; object_size_limit : vm_size_t); diff --git a/hurd/hurd_types.h b/hurd/hurd_types.h index 86b9bcbe..e1a644f1 100644 --- a/hurd/hurd_types.h +++ b/hurd/hurd_types.h @@ -201,7 +201,7 @@ enum term_bottom_type remap - TY, FL, NR NR * (OFFS, LEN) - 1 (BS and SIZE are that of the child) copy - TY, FL, SIZE - DATA - - (DATA is preceeded by padding to the next page boundary, and is + (DATA is preceded by padding to the next page boundary, and is SIZE bytes long itself) For ileave, concat, and layer, the children are encoded following the parent. diff --git a/hurd/io.defs b/hurd/io.defs index d30233e6..9119b05b 100644 --- a/hurd/io.defs +++ b/hurd/io.defs @@ -101,7 +101,7 @@ routine io_clear_some_openmodes ( when appropriate, to the designated port using sig_post. A port is also returned which will be used as the reference port in sending such signals (this is the "async IO ID" port). The async - call is cancelled by deleting all refernces to the async_id_port. + call is cancelled by deleting all references to the async_id_port. Each call to io_async generates a new ASYNC_ID_PORT. */ routine io_async ( |