Changeset 04803bf in mainline for uspace/app/tetris/input.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/app/tetris/input.c (modified) (2 diffs)

uspace/app/tetris/input.c

@@ -52 +52 @@
 #include <errno.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 
 #include "input.h"
@@ -97 +97 @@
         struct timeval starttv, endtv, *s;
         static ipc_call_t charcall;
-        ipcarg_t rc;
+        sysarg_t rc;
         
         /*