Changeset cf2af94 in mainline for uspace/lib/c/include/ipc/nil.h

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/c/include/ipc/nil.h (modified) (2 diffs)

uspace/lib/c/include/ipc/nil.h ¶

@@ -38 +38 @@
 #define LIBC_NIL_MESSAGES_H_
 
-#include <ipc/ipc.h>
 #include <ipc/net.h>
 
@@ -77 +76 @@
 
 /** Return the protocol service message parameter. */
-#define NIL_GET_PROTO(call) \
-        ({ \
-                services_t service = (services_t) IPC_GET_ARG2(*call); \
-                service; \
-        })
+#define NIL_GET_PROTO(call)  ((services_t) IPC_GET_ARG2(call))
 
 /*@}*/