Changeset 59ecd4a in mainline for uspace/lib/socket/include/net_modules.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/socket/include/net_modules.h (moved) (moved from uspace/srv/net/modules.h ) (8 diffs)

uspace/lib/socket/include/net_modules.h

@@ -70 +70 @@
  *  @param[in] answer_count The number of answer parameters.
  */
-void answer_call(ipc_callid_t callid, int result, ipc_call_t * answer, int answer_count);
+extern void answer_call(ipc_callid_t callid, int result, ipc_call_t * answer, int answer_count);
 
 /** Creates bidirectional connection with the needed module service and registers the message receiver.
@@ -81 +81 @@
  *  @returns Other error codes as defined for the ipc_connect_to_me() function.
  */
-int bind_service(services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver);
+extern int bind_service(services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver);
 
 /** Creates bidirectional connection with the needed module service and registers the message receiver.
@@ -94 +94 @@
  *  @returns Other error codes as defined for the ipc_connect_to_me() function.
  */
-int bind_service_timeout(services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout);
+extern int bind_service_timeout(services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout);
 
 /** Connects to the needed module.
@@ -100 +100 @@
  *  @returns The phone of the needed service.
  */
-int connect_to_service(services_t need);
+extern int connect_to_service(services_t need);
 
 /** Connects to the needed module.
@@ -108 +108 @@
  *  @returns ETIMEOUT if the connection timeouted.
  */
-int connect_to_service_timeout(services_t need, suseconds_t timeout);
+extern int connect_to_service_timeout(services_t need, suseconds_t timeout);
 
 /** Receives data from the other party.
@@ -120 +120 @@
  *  @returns Other error codes as defined for the async_data_write_finalize() function.
  */
-int data_receive(void ** data, size_t * length);
+extern int data_receive(void ** data, size_t * length);
 
 /** Replies the data to the other party.
@@ -130 +130 @@
  *  @returns Other error codes as defined for the async_data_read_finalize() function.
  */
-int data_reply(void * data, size_t data_length);
+extern int data_reply(void * data, size_t data_length);
 
 /** Refreshes answer structure and parameters count.
@@ -137 +137 @@
  *  @param[in,out] answer_count The number of answer parameters.
  */
-void refresh_answer(ipc_call_t * answer, int * answer_count);
+extern void refresh_answer(ipc_call_t * answer, int * answer_count);
 
 #endif