Changeset 6843a9c in mainline for uspace/srv/net/tcp/sock.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/net/tcp/sock.h (moved) (moved from kernel/arch/ia32/include/drivers/vesa.h ) (2 diffs)

uspace/srv/net/tcp/sock.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Vana
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup tcp
  * @{
  */
-/** @file
+/** @file Socket provider
  */
 
-#ifndef KERN_ia32_VESA_H_
-#define KERN_ia32_VESA_H_
+#ifndef SOCK_H
+#define SOCK_H
 
-#include <typedefs.h>
+#include <async.h>
 
-extern bool vesa_init(void);
+extern int tcp_sock_init(void);
 
 #endif