Changeset 04803bf in mainline for uspace/lib/c/generic/private/libc.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/generic/private/libc.h (moved) (moved from uspace/lib/libc/generic/sysinfo.c ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
-#include <libc.h>
-#include <sysinfo.h>
-#include <string.h>
+#ifndef LIBC_PRIVATE_LIBC_H_
+#define LIBC_PRIVATE_LIBC_H_
 
-sysarg_t sysinfo_value(char *name)
-{
-        return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name,
-            (sysarg_t) str_size(name));
-}
+extern void __entry(void);
+extern void __main(void *) __attribute__((noreturn));
+extern int main(int, char *[]);
+
+#endif
 
 /** @}