Changeset aa85487 in mainline for uspace/lib/libc/include

Timestamp:

2010-03-07T15:11:56Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

uspace/lib/libc/include

Files:

• async.h (modified) (1 diff)
• atomicdflt.h (modified) (1 diff)
• loader/loader.h (modified) (1 diff)
• stdio.h (modified) (1 diff)
• sysinfo.h (modified) (1 diff)
• task.h (modified) (1 diff)
• thread.h (modified) (1 diff)

uspace/lib/libc/include/async.h

@@ -259 +259 @@
 }
 
+extern int async_connect_me_to(int, ipcarg_t, ipcarg_t, ipcarg_t);
+extern int async_connect_me_to_blocking(int, ipcarg_t, ipcarg_t, ipcarg_t);
+
 /*
  * User-friendly wrappers for async_share_in_start().

uspace/lib/libc/include/atomicdflt.h

@@ -37 +37 @@
 
 #ifndef LIBC_ARCH_ATOMIC_H_
-#error This file cannot be included directly, include atomic.h instead.
+        #error This file cannot be included directly, include atomic.h instead.
 #endif
 
+#include <stdint.h>
 #include <bool.h>
 
 typedef struct atomic {
-        volatile long count;
+        volatile atomic_count_t count;
 } atomic_t;
 
-static inline void atomic_set(atomic_t *val, long i)
+static inline void atomic_set(atomic_t *val, atomic_count_t i)
 {
-        val->count = i;
+        val->count = i;
 }
 
-static inline long atomic_get(atomic_t *val)
+static inline atomic_count_t atomic_get(atomic_t *val)
 {
-        return val->count;
+        return val->count;
 }
 
 #ifndef CAS
-static inline bool cas(atomic_t *val, long ov, long nv)
+static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv)
 {
         return __sync_bool_compare_and_swap(&val->count, ov, nv);

uspace/lib/libc/include/loader/loader.h

@@ -51 +51 @@
 extern int loader_set_cwd(loader_t *);
 extern int loader_set_pathname(loader_t *, const char *);
-extern int loader_set_args(loader_t *, char *const[]);
+extern int loader_set_args(loader_t *, const char *const[]);
 extern int loader_set_files(loader_t *, fdi_node_t *const[]);
 extern int loader_load_program(loader_t *);

uspace/lib/libc/include/stdio.h

@@ -110 +110 @@
 /* Character and string input functions */
 extern int fgetc(FILE *);
-extern char *fgets(char *, size_t, FILE *);
+extern char *fgets(char *, int, FILE *);
 
 extern int getchar(void);

uspace/lib/libc/include/sysinfo.h

@@ -40 +40 @@
 #include <string.h>
 
-sysarg_t sysinfo_value(char *name);
+sysarg_t sysinfo_value(const char *name);
 
 #endif

uspace/lib/libc/include/task.h

@@ -47 +47 @@
 extern task_id_t task_get_id(void);
 extern int task_set_name(const char *name);
-extern task_id_t task_spawn(const char *path, char *const argv[]);
+extern task_id_t task_spawn(const char *path, const char *const argv[]);
 extern int task_wait(task_id_t id, task_exit_t *texit, int *retval);
 extern int task_retval(int val);

uspace/lib/libc/include/thread.h

@@ -45 +45 @@
 extern void __thread_main(uspace_arg_t *);
 
-extern int thread_create(void (*)(void *), void *, char *, thread_id_t *);
+extern int thread_create(void (*)(void *), void *, const char *, thread_id_t *);
 extern void thread_exit(int) __attribute__ ((noreturn));
 extern void thread_detach(thread_id_t);