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

uspace/app/tester/mm/malloc1.c

@@ -73 +73 @@
 
 typedef struct {
-        char *name;
+        const char *name;
         sp_term_cond_s cond;
         sp_action_prob_s prob;
@@ -90 +90 @@
 
 typedef struct {
-        char *name;
+        const char *name;
         ph_alloc_size_s alloc;
         subphase_s *subphases;
@@ -628 +628 @@
 }
 
-char *test_malloc1(void)
+const char *test_malloc1(void)
 {
         init_mem();