Index: uspace/lib/c/generic/io/console.c
===================================================================
--- uspace/lib/c/generic/io/console.c	(revision 25a179efc4ecca45aa90793992b6c1c2743fd07f)
+++ uspace/lib/c/generic/io/console.c	(revision 2ca5a198f7308b0c892b04c0fcda44f5e83eb8f0)
@@ -90,8 +90,8 @@
 }
 
-int console_get_size(console_ctrl_t *ctrl, sysarg_t *cols, sysarg_t *rows)
-{
-	async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-	int rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows);
+errno_t console_get_size(console_ctrl_t *ctrl, sysarg_t *cols, sysarg_t *rows)
+{
+	async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+	errno_t rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows);
 	async_exchange_end(exch);
 	
@@ -129,8 +129,8 @@
 }
 
-int console_get_color_cap(console_ctrl_t *ctrl, sysarg_t *ccap)
-{
-	async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-	int rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap);
+errno_t console_get_color_cap(console_ctrl_t *ctrl, sysarg_t *ccap)
+{
+	async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+	errno_t rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap);
 	async_exchange_end(exch);
 	
@@ -138,8 +138,8 @@
 }
 
-int console_get_pos(console_ctrl_t *ctrl, sysarg_t *col, sysarg_t *row)
-{
-	async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-	int rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row);
+errno_t console_get_pos(console_ctrl_t *ctrl, sysarg_t *col, sysarg_t *row)
+{
+	async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+	errno_t rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row);
 	async_exchange_end(exch);
 	
@@ -154,5 +154,5 @@
 }
 
-static int console_ev_decode(ipc_call_t *call, cons_event_t *event)
+static errno_t console_ev_decode(ipc_call_t *call, cons_event_t *event)
 {
 	event->type = IPC_GET_ARG1(*call);
@@ -188,5 +188,5 @@
 		async_exchange_end(exch);
 		
-		int rc;
+		errno_t rc;
 		async_wait_for(aid, &rc);
 		
@@ -202,5 +202,5 @@
 		}
 	} else {
-		int retval;
+		errno_t retval;
 		async_wait_for(ctrl->input_aid, &retval);
 		
@@ -212,5 +212,5 @@
 		}
 		
-		int rc = console_ev_decode(&ctrl->input_call, event);
+		errno_t rc = console_ev_decode(&ctrl->input_call, event);
 		if (rc != EOK) {
 			errno = rc;
@@ -235,6 +235,6 @@
 	}
 	
-	int retval;
-	int rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
+	errno_t retval;
+	errno_t rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
 	if (rc != EOK) {
 		*timeout = 0;