Changeset 97c7682 in mainline for uspace/srv/net/udp/sock.h

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/net/udp/sock.h (moved) (moved from uspace/lib/c/include/net/icmp_common.h ) (2 diffs)

uspace/srv/net/udp/sock.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
- *  @{
+/** @addtogroup udp
+ * @{
+ */
+/** @file Socket provider
  */
 
-/** @file
- * ICMP module common interface.
- */
+#ifndef SOCK_H
+#define SOCK_H
 
-#ifndef LIBC_ICMP_COMMON_H_
-#define LIBC_ICMP_COMMON_H_
-
-#include <ipc/services.h>
-#include <sys/time.h>
 #include <async.h>
 
-extern async_sess_t *icmp_connect_module(void);
+extern int udp_sock_init(void);
 
 #endif