Changeset 8ad5470 in mainline for uspace/lib


Ignore:
Timestamp:
2012-05-24T15:30:53Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fa3704d
Parents:
15b794d (diff), df3f85f (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 with mainline

Location:
uspace/lib
Files:
2 added
19 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/stacktrace.c

    r15b794d r8ad5470  
    3838#include <sys/types.h>
    3939#include <errno.h>
     40#include <unistd.h>
    4041
    4142static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);

  • uspace/lib/c/generic/stats.c

    r15b794d r8ad5470  
    4040#include <inttypes.h>
    4141#include <malloc.h>
     42#include <unistd.h>
    4243
    4344#define SYSINFO_STATS_MAX_PATH  64

  • uspace/lib/c/generic/sysinfo.c

    r15b794d r8ad5470  
    3939#include <malloc.h>
    4040#include <bool.h>
     41#include <unistd.h>
    4142
    4243/** Get sysinfo keys size

  • uspace/lib/c/generic/time.c

    r15b794d r8ad5470  
    4343#include <ddi.h>
    4444#include <libc.h>
     45#include <unistd.h>
    4546
    4647/** Pointer to kernel shared variables with time */

  • uspace/lib/c/include/errno.h

    r15b794d r8ad5470  
    3737
    3838#include <abi/errno.h>
    39 #include <fibril.h>
    4039
    4140#define errno  (*(__errno()))

  • uspace/lib/c/include/stdarg.h

    r15b794d r8ad5470  
    4343#define va_arg(ap, type)    __builtin_va_arg(ap, type)
    4444#define va_end(ap)          __builtin_va_end(ap)
     45#define va_copy(dst, src)   __builtin_va_copy(dst, src)
    4546
    4647#endif

  • uspace/lib/c/include/stdio.h

    r15b794d r8ad5470  
    3939#include <stdarg.h>
    4040#include <str.h>
    41 #include <adt/list.h>
    4241
    4342#ifndef NVERIFY_PRINTF

  • uspace/lib/c/include/unistd.h

    r15b794d r8ad5470  
    5858#define getpagesize()  (PAGE_SIZE)
    5959
    60 extern int dup2(int oldfd, int newfd);
     60extern int dup2(int, int);
    6161
    6262extern ssize_t write(int, const void *, size_t);
    … …  
    7373extern int unlink(const char *);
    7474
    75 extern char *getcwd(char *buf, size_t);
     75extern char *getcwd(char *, size_t);
    7676extern int rmdir(const char *);
    7777extern int chdir(const char *);

  • uspace/lib/clui/tinput.h

    r15b794d r8ad5470  
    3737#define LIBCLUI_TINPUT_H_
    3838
    39 #include <adt/list.h>
    40 #include <async.h>
    4139#include <inttypes.h>
    4240#include <io/console.h>

  • uspace/lib/drv/generic/logbuf.c

    r15b794d r8ad5470  
    3535#include <ddf/log.h>
    3636#include <assert.h>
     37#include <unistd.h>
    3738
    3839/** Formatting string for printing number of not-printed items. */

  • uspace/lib/drv/include/ddf/interrupt.h

    r15b794d r8ad5470  
    3636#define DDF_INTERRUPT_H_
    3737
     38#include <libarch/common.h>
     39#include <libarch/types.h>
    3840#include <abi/ddi/irq.h>
    3941#include <adt/list.h>

  • uspace/lib/posix/Makefile

    r15b794d r8ad5470  
    4343        fcntl.c \
    4444        fnmatch.c \
     45        getopt.c \
    4546        locale.c \
    4647        math.c \

  • uspace/lib/posix/errno.h

    r15b794d r8ad5470  
    6666#undef errno
    6767#define errno (*__posix_errno())
     68
     69#include "unistd.h"
    6870
    6971extern int *__posix_errno(void);

  • uspace/lib/posix/pwd.c

    r15b794d r8ad5470  
    3838#include "string.h"
    3939#include "errno.h"
     40#include "assert.h"
    4041
    4142static bool entry_read = false;

  • uspace/lib/posix/stdbool.h

    r15b794d r8ad5470  
    3737
    3838#ifdef LIBC_BOOL_H_
    39         #error "You can't include bool.h and stdbool.h at the same time."
     39#if (!defined(POSIX_STDIO_H_)) \
     40                && (!defined(POSIX_STDLIB_H_)) \
     41                && (!defined(POSIX_STRING_H_))
     42#error "You can't include bool.h and stdbool.h at the same time."
    4043#endif
     44#endif
     45
    4146#define LIBC_BOOL_H_
    4247

  • uspace/lib/posix/stdio.h

    r15b794d r8ad5470  
    3737#define POSIX_STDIO_H_
    3838
     39#include "stddef.h"
     40#include "unistd.h"
    3941#include "libc/stdio.h"
    4042#include "sys/types.h"

  • uspace/lib/posix/time.c

    r15b794d r8ad5470  
    4545#include "errno.h"
    4646#include "signal.h"
     47#include "assert.h"
    4748
    4849#include "libc/malloc.h"

  • uspace/lib/posix/unistd.c

    r15b794d r8ad5470  
    4949/* Array of environment variable strings (NAME=VALUE). */
    5050char **posix_environ = NULL;
     51char *posix_optarg;
    5152
    5253/**

  • uspace/lib/posix/unistd.h

    r15b794d r8ad5470  
    4343#define _exit exit
    4444
    45 /* Option Arguments */
    46 extern char *optarg;
     45extern char *posix_optarg;
    4746extern int optind, opterr, optopt;
    48 extern int getopt(int, char * const [], const char *);
     47extern int posix_getopt(int, char * const [], const char *);
    4948
    5049/* Environment */
    … …  
    144143
    145144#ifndef LIBPOSIX_INTERNAL
     145        #define getopt posix_getopt
     146        #define optarg posix_optarg
     147
    146148        #define environ posix_environ
    147149
Note: See TracChangeset for help on using the changeset viewer.