Changeset 8b5690f in mainline for uspace/lib/c/generic/private/libc.h

Timestamp:

2011-02-03T05:11:01Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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/c/generic/private/libc.h (moved) (moved from uspace/srv/net/il/arp/arp_module.h ) (2 diffs)

uspace/lib/c/generic/private/libc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup arp
+/** @addtogroup libc
  * @{
  */
-
 /** @file
- * ARP module functions.
- * The functions are used as ARP module entry points.
  */
 
-#ifndef NET_ARP_MODULE_H_
-#define NET_ARP_MODULE_H_
+#ifndef LIBC_PRIVATE_LIBC_H_
+#define LIBC_PRIVATE_LIBC_H_
 
-#include <ipc/ipc.h>
-#include <async.h>
-
-extern int arp_initialize(async_client_conn_t);
-extern int arp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+extern int main(int, char *[]);
+extern void __main(void *) __attribute__((noreturn));
 
 #endif