Changeset 59ecd4a in mainline for uspace/lib/net/include/nil_module.h

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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/net/include/nil_module.h (moved) (moved from uspace/srv/net/nil/nil_module.h ) (3 diffs)

uspace/lib/net/include/nil_module.h

@@ -36 +36 @@
  */
 
-#ifndef __NET_ETH_MODULE_H__
-#define __NET_ETH_MODULE_H__
+#ifndef __NET_NIL_MODULE_H__
+#define __NET_NIL_MODULE_H__
 
 #include <ipc/ipc.h>
@@ -47 +47 @@
  *  @returns Other error codes as defined for each specific module initialize function.
  */
-int nil_initialize(int net_phone);
+extern int nil_initialize(int net_phone);
 
 /** Message processing function.
@@ -60 +60 @@
  *  @see IS_NET_NIL_MESSAGE()
  */
-int nil_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+extern int nil_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 #endif