Changeset 2b3dd78 in mainline for uspace/app/tetris/tetris.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

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

uspace/app/tetris/tetris.c

@@ -156 +156 @@
 const struct shape *randshape(void)
 {
-        const struct shape *tmp = &shapes[random() % 7];
+        const struct shape *tmp = &shapes[rand() % 7];
         int i;
-        int j = random() % 4;
+        int j = rand() % 4;
         
         for (i = 0; i < j; i++)
@@ -171 +171 @@
         
         gettimeofday(&tv, NULL);
-        srandom(tv.tv_sec + tv.tv_usec / 100000);
+        srand(tv.tv_sec + tv.tv_usec / 100000);
 }