Changeset 04803bf in mainline for uspace/app/tester/ipc/ping_pong.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/tester/ipc/ping_pong.c (modified) (2 diffs)

uspace/app/tester/ipc/ping_pong.c

@@ -38 +38 @@
 #define COUNT_GRANULARITY  100
 
-char *test_ping_pong(void)
+const char *test_ping_pong(void)
 {
         TPRINTF("Pinging ns server for %d seconds...", DURATION_SECS);
@@ -72 +72 @@
         }
         
-        TPRINTF("OK\nCompleted %llu round trips in %u seconds, %llu rt/s.\n",
+        TPRINTF("OK\nCompleted %" PRIu64 " round trips in %u seconds, %" PRIu64 " rt/s.\n",
             count, DURATION_SECS, count / DURATION_SECS);