Changeset 59ecd4a in mainline for uspace/app/nettest1/nettest.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/app/nettest1/nettest.h (moved) (moved from uspace/srv/net/app/nettest.h ) (8 diffs)

uspace/app/nettest1/nettest.h

@@ -38 +38 @@
 #define __NET_TEST__
 
-#include "../include/socket.h"
+#include <socket.h>
 
 /** Prints a mark.
@@ -44 +44 @@
  *  @param[in] index The index of the mark to be printed.
  */
-void print_mark(int index);
+extern void print_mark(int index);
 
 /** Creates new sockets.
@@ -55 +55 @@
  *  @returns Other error codes as defined for the socket() function.
  */
-int sockets_create(int verbose, int * socket_ids, int sockets, int family, sock_type_t type);
+extern int sockets_create(int verbose, int * socket_ids, int sockets, int family, sock_type_t type);
 
 /** Closes sockets.
@@ -64 +64 @@
  *  @returns Other error codes as defined for the closesocket() function.
  */
-int sockets_close(int verbose, int * socket_ids, int sockets);
+extern int sockets_close(int verbose, int * socket_ids, int sockets);
 
 /** Connects sockets.
@@ -75 +75 @@
  *  @returns Other error codes as defined for the connect() function.
  */
-int sockets_connect(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen);
+extern int sockets_connect(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen);
 
 /** Sends data via sockets.
@@ -89 +89 @@
  *  @returns Other error codes as defined for the sendto() function.
  */
-int sockets_sendto(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen, char * data, int size, int messages);
+extern int sockets_sendto(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen, char * data, int size, int messages);
 
 /** Receives data via sockets.
@@ -103 +103 @@
  *  @returns Other error codes as defined for the recvfrom() function.
  */
-int sockets_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
+extern int sockets_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
 
 /** Sends and receives data via sockets.
@@ -119 +119 @@
  *  @returns Other error codes as defined for the recvfrom() function.
  */
-int sockets_sendto_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
+extern int sockets_sendto_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
 
 #endif