Changeset 8023571 in mainline for uspace/app/tetris

Timestamp:

2010-03-21T09:40:37Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c682dd1

Parents:

4e9aaf5 (diff), 19f857a (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 from dev/misc.

Location:

uspace/app/tetris

Files:

• input.c (modified) (1 diff)
• scores.c (modified) (1 diff)
• scores.h (modified) (1 diff)
• screen.c (modified) (1 diff)
• tetris.c (modified) (1 diff)

uspace/app/tetris/input.c

@@ -52 +52 @@
 #include <errno.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 
 #include "input.h"

uspace/app/tetris/scores.c

@@ -52 +52 @@
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>

uspace/app/tetris/scores.h

@@ -48 +48 @@
 
 #include <sys/time.h>
-#include <string.h>
+#include <str.h>
 
 #define MAXLOGNAME   16

uspace/app/tetris/screen.c

@@ -49 +49 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <vfs/vfs.h>

uspace/app/tetris/tetris.c

@@ -53 +53 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <getopt.h>