Changeset 8fb1bf82 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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.

File:

• uspace/lib/c/generic/async.c (modified) (2 diffs)

uspace/lib/c/generic/async.c

@@ -536 +536 @@
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
-                return NULL;
+                return (uintptr_t) NULL;
         }
         
@@ -556 +556 @@
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
-                return NULL;
+                return (uintptr_t) NULL;
         }