Changeset d948095 in mainline


Ignore:
Timestamp:
2012-10-05T08:04:52Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b60faf7
Parents:
be1dcc26 (diff), 32b3a12 (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 libposix cleaning (lp:~vojtech-horky/helenos/misc)

Sources and headers were separated into different directories.

There are less includes from HelenOS-specific libc into public headers
of libposix. That way, the POSIX namespace is not polluted with HelenOS
specific functions (that may collide with functions declared by
other applications).

Location:
uspace
Files:
2 added
4 edited
48 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    rbe1dcc26 rd948095  
    227227
    228228ifeq ($(POSIX_COMPAT),y)
    229         CFLAGS = -I$(LIBPOSIX_PREFIX)
     229        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
    230230        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
    231231endif

  • uspace/app/msim/arch_helenos/input.c

    rbe1dcc26 rd948095  
    3232/** @file HelenOS specific functions for MSIM simulator.
    3333 */
     34
     35/* Because of asprintf. */
     36#define _GNU_SOURCE
    3437#include "../../io/input.h"
    3538#include "../../io/output.h"
    … …  
    3841#include <tinput.h>
    3942#include <errno.h>
     43#include <stdlib.h>
    4044
    4145static tinput_t *input_prompt;

  • uspace/app/msim/arch_helenos/misc.c

    rbe1dcc26 rd948095  
    4444#include <ctype.h>
    4545#include <stdio.h>
     46#include <stdlib.h>
    4647
    4748/* Define when the dprinter device shall try to filter

  • uspace/lib/posix/Makefile

    rbe1dcc26 rd948095  
    3333LSONAME = libposix.so0
    3434
    35 INCLUDE_LIBC = ./libc
     35EXTRA_CFLAGS = -Iinclude/
     36
     37INCLUDE_LIBC = ./include/libc
    3638
    3739PRE_DEPEND = $(INCLUDE_LIBC)
    … …  
    3941
    4042SOURCES = \
    41         ctype.c \
    42         errno.c \
    43         fcntl.c \
    44         fnmatch.c \
    45         getopt.c \
    46         locale.c \
    47         math.c \
    48         pwd.c \
    49         signal.c \
    50         stdio.c \
    51         stdio/scanf.c \
    52         stdlib.c \
    53         stdlib/strtol.c \
    54         stdlib/strtold.c \
    55         string.c \
    56         strings.c \
    57         sys/stat.c \
    58         sys/wait.c \
    59         time.c \
    60         unistd.c
     43        source/ctype.c \
     44        source/errno.c \
     45        source/fcntl.c \
     46        source/fnmatch.c \
     47        source/getopt.c \
     48        source/locale.c \
     49        source/math.c \
     50        source/pwd.c \
     51        source/signal.c \
     52        source/stdio.c \
     53        source/stdio/scanf.c \
     54        source/stdlib.c \
     55        source/stdlib/strtol.c \
     56        source/stdlib/strtold.c \
     57        source/string.c \
     58        source/strings.c \
     59        source/sys/stat.c \
     60        source/sys/wait.c \
     61        source/time.c \
     62        source/unistd.c
    6163
    6264include $(USPACE_PREFIX)/Makefile.common
    6365
    6466$(INCLUDE_LIBC): ../c/include
    65         ln -s -f -n $^ $@
     67        ln -s -f -n ../$^ $@

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

    rbe1dcc26 rd948095  
    6666#undef errno
    6767#define errno (*__posix_errno())
    68 
    69 #include "unistd.h"
    7068
    7169extern int *__posix_errno(void);

  • uspace/lib/posix/include/posix/fcntl.h

    rbe1dcc26 rd948095  
    7272#define FD_CLOEXEC         1 /* Close on exec. */
    7373
    74 #undef open
    75 #define open(path, ...) \
    76         ({ \
    77                 int rc = open(path, ##__VA_ARGS__); \
    78                 if (rc < 0) { \
    79                         errno = -rc; \
    80                         rc = -1; \
    81                 } \
    82                 rc; \
    83         })
    84 
     74extern int posix_open(const char *pathname, int flags, ...);
    8575extern int posix_fcntl(int fd, int cmd, ...);
    8676
    8777#ifndef LIBPOSIX_INTERNAL
    8878        #define fcntl posix_fcntl
     79        #define open posix_open
    8980#endif
    9081

  • uspace/lib/posix/include/posix/signal.h

    rbe1dcc26 rd948095  
    3636#define POSIX_SIGNAL_H_
    3737
    38 #include "libc/errno.h"
    3938#include "sys/types.h"
    4039

  • uspace/lib/posix/include/posix/stddef.h

    rbe1dcc26 rd948095  
    3636#define POSIX_STDDEF_H_
    3737
    38 #include "libc/stddef.h"
     38#include "sys/types.h"
    3939
    4040#ifndef NULL

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

    rbe1dcc26 rd948095  
    3939#include "stddef.h"
    4040#include "unistd.h"
    41 #include "libc/stdio.h"
     41#include "libc/io/verify.h"
    4242#include "sys/types.h"
    43 #include "libc/stdarg.h"
     43#include "stdarg.h"
    4444#include "limits.h"
     45
     46/*
     47 * These are the same as in HelenOS libc.
     48 * It would be possible to directly include <stdio.h> but
     49 * it is better not to pollute POSIX namespace with other functions
     50 * defined in that header.
     51 *
     52 * Because libposix is always linked with libc, providing only these
     53 * forward declarations ought to be enough.
     54 */
     55#define EOF (-1)
     56
     57#define BUFSIZ  4096
     58#define SEEK_SET  0
     59#define SEEK_CUR  1
     60#define SEEK_END  2
     61
     62typedef struct _IO_FILE FILE;
     63
     64extern FILE *stdin;
     65extern FILE *stdout;
     66extern FILE *stderr;
     67
     68extern int fgetc(FILE *);
     69extern char *fgets(char *, int, FILE *);
     70
     71extern int getchar(void);
     72extern char *gets(char *, size_t);
     73
     74extern int fputc(wchar_t, FILE *);
     75extern int fputs(const char *, FILE *);
     76
     77extern int putchar(wchar_t);
     78extern int puts(const char *);
     79
     80extern int fprintf(FILE *, const char*, ...) PRINTF_ATTRIBUTE(2, 3);
     81extern int vfprintf(FILE *, const char *, va_list);
     82
     83extern int printf(const char *, ...) PRINTF_ATTRIBUTE(1, 2);
     84extern int vprintf(const char *, va_list);
     85
     86extern int snprintf(char *, size_t , const char *, ...) PRINTF_ATTRIBUTE(3, 4);
     87#ifdef _GNU_SOURCE
     88extern int asprintf(char **, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
     89#endif
     90extern int vsnprintf(char *, size_t, const char *, va_list);
     91
     92extern FILE *fopen(const char *, const char *);
     93extern FILE *fdopen(int, const char *);
     94extern int fclose(FILE *);
     95
     96extern size_t fread(void *, size_t, size_t, FILE *);
     97extern size_t fwrite(const void *, size_t, size_t, FILE *);
     98
     99extern int fseek(FILE *, off64_t, int);
     100extern void rewind(FILE *);
     101extern off64_t ftell(FILE *);
     102extern int feof(FILE *);
     103extern int fileno(FILE *);
     104
     105extern int fflush(FILE *);
     106extern int ferror(FILE *);
     107extern void clearerr(FILE *);
     108
     109extern void setvbuf(FILE *, void *, int, size_t);
     110
     111
     112/* POSIX specific stuff. */
    45113
    46114/* Identifying the Terminal */

  • uspace/lib/posix/include/posix/stdlib.h

    rbe1dcc26 rd948095  
    3737#define POSIX_STDLIB_H_
    3838
    39 #include "libc/stdlib.h"
     39#include "sys/types.h"
    4040
    4141#ifndef NULL
    … …  
    5050#define _Exit exit
    5151extern int posix_atexit(void (*func)(void));
     52extern void exit(int status);
     53extern void abort(void) __attribute__((noreturn));
    5254
    5355/* Absolute Value */

  • uspace/lib/posix/include/posix/string.h

    rbe1dcc26 rd948095  
    3737#define POSIX_STRING_H_
    3838
    39 #include <mem.h>
    40 #include <str.h>
     39#include "sys/types.h"
    4140
    42 /* available in str.h
    43  *
    44  * char *strtok(char *restrict, const char *restrict);
    45  * char *strtok_r(char *restrict, const char *restrict, char **restrict);
    46  *
    47  * available in mem.h
    48  *
    49  * void *memset(void *, int, size_t);
    50  * void *memcpy(void *, const void *, size_t);
    51  * void *memmove(void *, const void *, size_t);
    52  *
     41/*
    5342 * TODO: not implemented due to missing locale support
    5443 *
    … …  
    6150        #define NULL  ((void *) 0)
    6251#endif
     52
     53/*
     54 * These are the same as in HelenOS libc.
     55 * It would be possible to directly include <str.h> and <mem.h> but
     56 * it is better not to pollute POSIX namespace with other functions
     57 * defined in that header.
     58 *
     59 * Because libposix is always linked with libc, providing only these
     60 * forward declarations ought to be enough.
     61 */
     62/* From str.h. */
     63extern char * strtok_r(char *, const char *, char **);
     64extern char * strtok(char *, const char *);
     65
     66/* From mem.h */
     67#define bzero(ptr, len)  memset((ptr), 0, (len))
     68extern void *memset(void *, int, size_t);
     69extern void *memcpy(void *, const void *, size_t);
     70extern void *memmove(void *, const void *, size_t);
     71
    6372
    6473/* Copying and Concatenation */

  • uspace/lib/posix/include/posix/sys/mman.h

    rbe1dcc26 rd948095  
    3636#define POSIX_SYS_MMAN_H_
    3737
    38 #include "../libc/sys/mman.h"
     38#include "sys/types.h"
     39#include <abi/mm/as.h>
     40
     41#define MAP_FAILED ((void *) -1)
     42
     43#define MAP_SHARED     (1 << 0)
     44#define MAP_PRIVATE    (1 << 1)
     45#define MAP_FIXED      (1 << 2)
     46#define MAP_ANONYMOUS  (1 << 3)
    3947
    4048#undef PROT_NONE
    … …  
    4351#undef PROT_EXEC
    4452#define PROT_NONE  0
    45 #define PROT_READ  PROTO_READ
    46 #define PROT_WRITE PROTO_WRITE
    47 #define PROT_EXEC  PROTO_EXEC
     53#define PROT_READ  AS_AREA_READ
     54#define PROT_WRITE AS_AREA_WRITE
     55#define PROT_EXEC  AS_AREA_EXEC
     56
     57extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
     58    posix_off_t offset);
     59extern int munmap(void *start, size_t length);
    4860
    4961#endif /* POSIX_SYS_MMAN_H_ */

  • uspace/lib/posix/include/posix/sys/stat.h

    rbe1dcc26 rd948095  
    3737#define POSIX_SYS_STAT_H_
    3838
    39 #include "../libc/sys/stat.h"
    4039#include "types.h"
    4140#include "../time.h"
    … …  
    130129extern int posix_chmod(const char *path, mode_t mode);
    131130extern mode_t posix_umask(mode_t mask);
     131extern int mkdir(const char *, mode_t);
    132132
    133133#ifndef LIBPOSIX_INTERNAL

  • uspace/lib/posix/include/posix/sys/types.h

    rbe1dcc26 rd948095  
    3737#define POSIX_SYS_TYPES_H_
    3838
    39 #include "../libc/sys/types.h"
     39#include "libc/sys/types.h"
     40#include "libc/sys/time.h"
    4041
    4142typedef unsigned int posix_ino_t;

  • uspace/lib/posix/include/posix/time.h

    rbe1dcc26 rd948095  
    3737#define POSIX_TIME_H_
    3838
    39 #include "libc/time.h"
    4039#include "sys/types.h"
    4140

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

    rbe1dcc26 rd948095  
    3737#define POSIX_UNISTD_H_
    3838
    39 #include "libc/unistd.h"
    4039#include "sys/types.h"
     40#include "stddef.h"
    4141
    4242/* Process Termination */

  • uspace/lib/posix/source/ctype.c

    rbe1dcc26 rd948095  
    3636#define LIBPOSIX_INTERNAL
    3737
    38 #include "ctype.h"
     38#include "posix/ctype.h"
    3939
    4040/**

  • uspace/lib/posix/source/errno.c

    rbe1dcc26 rd948095  
    3333 */
    3434
    35 #include "errno.h"
     35#include "posix/errno.h"
    3636
    37 #include "stdlib.h"
     37#include "posix/stdlib.h"
    3838#include "libc/fibril.h"
    3939

  • uspace/lib/posix/source/fcntl.c

    rbe1dcc26 rd948095  
    3636
    3737#include "internal/common.h"
    38 #include "fcntl.h"
     38#include "posix/fcntl.h"
    3939
    4040#include "libc/unistd.h"
    4141#include "libc/vfs/vfs.h"
    42 #include "errno.h"
     42#include "posix/errno.h"
    4343
    4444/**
    … …  
    9595}
    9696
     97/**
     98 * Open, possibly create, a file.
     99 *
     100 * @param pathname Path to the file.
     101 * @param flags Access mode flags.
     102 */
     103int posix_open(const char *pathname, int flags, ...)
     104{
     105        mode_t mode = 0;
     106        if ((flags & O_CREAT) > 0) {
     107                va_list args;
     108                va_start(args, flags);
     109                mode = va_arg(args, mode_t);
     110                va_end(args);
     111        }
     112
     113        int rc = open(pathname, flags, mode);
     114        if (rc < 0) {
     115                errno = -rc;
     116                rc = -1;
     117        }
     118
     119        return rc;
     120}
     121
    97122/** @}
    98123 */

  • uspace/lib/posix/source/fnmatch.c

    rbe1dcc26 rd948095  
    4242 */
    4343
    44 #include "stdbool.h"
    45 #include "ctype.h"
    46 #include "string.h"
    47 #include "stdlib.h"
    48 #include "assert.h"
    49 
    5044#define LIBPOSIX_INTERNAL
    5145
     46#include "posix/stdbool.h"
     47#include "posix/ctype.h"
     48#include "posix/string.h"
     49#include "posix/stdlib.h"
     50#include "posix/assert.h"
     51
    5252#include "internal/common.h"
    53 #include "fnmatch.h"
     53#include "posix/fnmatch.h"
    5454
    5555/* Returned by _match... functions. */
    … …  
    182182        { "alnum", isalnum },
    183183        { "alpha", isalpha },
    184         { "blank", isblank },
    185         { "cntrl", iscntrl },
     184        { "blank", posix_isblank },
     185        { "cntrl", posix_iscntrl },
    186186        { "digit", isdigit },
    187         { "graph", isgraph },
     187        { "graph", posix_isgraph },
    188188        { "lower", islower },
    189         { "print", isprint },
    190         { "punct", ispunct },
     189        { "print", posix_isprint },
     190        { "punct", posix_ispunct },
    191191        { "space", isspace },
    192192        { "upper", isupper },
    193         { "xdigit", isxdigit }
     193        { "xdigit", posix_isxdigit }
    194194};
    195195
    … …  
    204204{
    205205        const struct _char_class *class = elem;
    206         return strcmp((const char *) key, class->name);
     206        return posix_strcmp((const char *) key, class->name);
    207207}
    208208
    … …  
    217217{
    218218        /* Search for class in the array of supported character classes. */
    219         const struct _char_class *class = bsearch(cname, _char_classes,
     219        const struct _char_class *class = posix_bsearch(cname, _char_classes,
    220220            sizeof(_char_classes) / sizeof(struct _char_class),
    221221            sizeof(struct _char_class), _class_compare);
    … …  
    549549                        end = string;
    550550                } else {
    551                         end = strchrnul(string, pathname ? '/' : '\0');
     551                        end = gnu_strchrnul(string, pathname ? '/' : '\0');
    552552                }
    553553
    … …  
    581581{
    582582        assert(s != NULL);
    583         char *result = strdup(s);
     583        char *result = posix_strdup(s);
    584584        for (char *i = result; *i != '\0'; ++i) {
    585585                *i = tolower(*i);

  • uspace/lib/posix/source/getopt.c

    rbe1dcc26 rd948095  
    3636#include "internal/common.h"
    3737#include "libc/getopt.h"
    38 #include "getopt.h"
     38#include "posix/getopt.h"
    3939
    4040

  • uspace/lib/posix/source/locale.c

    rbe1dcc26 rd948095  
    3636
    3737#include "internal/common.h"
    38 #include "locale.h"
     38#include "posix/locale.h"
    3939
    40 #include "errno.h"
    41 #include "limits.h"
    42 #include "string.h"
     40#include "posix/errno.h"
     41#include "posix/limits.h"
     42#include "posix/string.h"
    4343
    4444/* Just a very basic dummy implementation.

  • uspace/lib/posix/source/math.c

    rbe1dcc26 rd948095  
    3636
    3737#include "internal/common.h"
    38 #include "math.h"
     38#include "posix/math.h"
    3939
    4040/**

  • uspace/lib/posix/source/pwd.c

    rbe1dcc26 rd948095  
    3535#define LIBPOSIX_INTERNAL
    3636
    37 #include "pwd.h"
    38 #include "string.h"
    39 #include "errno.h"
    40 #include "assert.h"
     37#include "posix/stdbool.h"
     38#include "posix/pwd.h"
     39#include "posix/string.h"
     40#include "posix/errno.h"
     41#include "posix/assert.h"
    4142
    4243static bool entry_read = false;

  • uspace/lib/posix/source/signal.c

    rbe1dcc26 rd948095  
    3535#define LIBPOSIX_INTERNAL
    3636
    37 #include "signal.h"
     37#include "posix/signal.h"
    3838#include "internal/common.h"
    39 #include "limits.h"
    40 #include "stdlib.h"
    41 #include "string.h"
    42 #include "errno.h"
     39#include "posix/limits.h"
     40#include "posix/stdlib.h"
     41#include "posix/string.h"
     42#include "posix/errno.h"
    4343
    4444#include "libc/fibril_synch.h"

  • uspace/lib/posix/source/stdio.c

    rbe1dcc26 rd948095  
    3737
    3838/* Has to be first. */
    39 #include "stdbool.h"
     39#include "posix/stdbool.h"
    4040
    4141#include "internal/common.h"
    42 #include "stdio.h"
    43 
    44 #include "assert.h"
    45 #include "errno.h"
    46 #include "stdlib.h"
    47 #include "string.h"
    48 #include "sys/types.h"
    49 #include "unistd.h"
    50 
     42#include "posix/stdio.h"
     43
     44#include "posix/assert.h"
     45#include "posix/errno.h"
     46#include "posix/stdlib.h"
     47#include "posix/string.h"
     48#include "posix/sys/types.h"
     49#include "posix/unistd.h"
     50
     51#include "libc/stdio.h"
    5152#include "libc/io/printf_core.h"
    5253#include "libc/str.h"
    … …  
    5960 * need to be implemented in libc anyway
    6061 */
    61 #include "../c/generic/private/stdio.h"
     62#include "../../c/generic/private/stdio.h"
    6263
    6364/** Clears the stream's error and end-of-file indicators.

  • uspace/lib/posix/source/stdio/scanf.c

    rbe1dcc26 rd948095  
    3636
    3737/* Must be first. */
    38 #include "../stdbool.h"
    39 
    40 #include "../assert.h"
    41 #include "../errno.h"
    42 
    43 #include "../stdio.h"
    44 #include "../stdlib.h"
    45 #include "../stddef.h"
    46 #include "../string.h"
    47 #include "../ctype.h"
    48 #include "../sys/types.h"
     38#include "posix/stdbool.h"
     39
     40#include "posix/assert.h"
     41#include "posix/errno.h"
     42
     43#include "posix/stdio.h"
     44#include "posix/stdlib.h"
     45#include "posix/stddef.h"
     46#include "posix/string.h"
     47#include "posix/ctype.h"
     48#include "posix/sys/types.h"
    4949
    5050#include "../internal/common.h"
    51 #include "../libc/malloc.h"
     51#include "libc/malloc.h"
    5252
    5353/** Unified data type for possible data sources for scanf. */

  • uspace/lib/posix/source/stdlib.c

    rbe1dcc26 rd948095  
    3737
    3838#include "internal/common.h"
    39 #include "stdlib.h"
    40 
    41 #include "errno.h"
    42 #include "fcntl.h"
    43 #include "limits.h"
    44 #include "string.h"
    45 #include "sys/stat.h"
    46 #include "unistd.h"
     39#include "posix/stdlib.h"
     40
     41#include "posix/errno.h"
     42#include "posix/fcntl.h"
     43#include "posix/limits.h"
     44#include "posix/string.h"
     45#include "posix/sys/stat.h"
     46#include "posix/unistd.h"
    4747
    4848#include "libc/sort.h"

  • uspace/lib/posix/source/stdlib/strtol.c

    rbe1dcc26 rd948095  
    3636
    3737#include "../internal/common.h"
    38 #include "../stdlib.h"
    39 
    40 #include "../ctype.h"
    41 #include "../errno.h"
    42 #include "../inttypes.h"
    43 #include "../limits.h"
     38#include "posix/stdlib.h"
     39
     40#include "posix/ctype.h"
     41#include "posix/errno.h"
     42#include "posix/inttypes.h"
     43#include "posix/limits.h"
    4444
    4545#define intmax_t posix_intmax_t

  • uspace/lib/posix/source/stdlib/strtold.c

    rbe1dcc26 rd948095  
    3636
    3737/* Must be first. */
    38 #include "../stdbool.h"
     38#include "posix/stdbool.h"
    3939
    4040#include "../internal/common.h"
    41 #include "../stdlib.h"
    42 
    43 #include "../assert.h"
    44 #include "../ctype.h"
    45 #include "../stdint.h"
    46 #include "../strings.h"
    47 #include "../errno.h"
    48 #include "../limits.h"
    49 
    50 #include "../float.h"
     41#include "posix/stdlib.h"
     42
     43#include "posix/assert.h"
     44#include "posix/ctype.h"
     45#include "posix/stdint.h"
     46#include "posix/strings.h"
     47#include "posix/errno.h"
     48#include "posix/limits.h"
     49
     50#include "posix/float.h"
    5151
    5252#ifndef HUGE_VALL

  • uspace/lib/posix/source/string.c

    rbe1dcc26 rd948095  
    3737
    3838#include "internal/common.h"
    39 #include "string.h"
    40 
    41 #include "assert.h"
    42 #include "errno.h"
    43 #include "limits.h"
    44 #include "stdlib.h"
    45 #include "signal.h"
     39#include "posix/string.h"
     40
     41#include "posix/assert.h"
     42#include "posix/errno.h"
     43#include "posix/limits.h"
     44#include "posix/stdlib.h"
     45#include "posix/signal.h"
    4646
    4747#include "libc/str_error.h"

  • uspace/lib/posix/source/strings.c

    rbe1dcc26 rd948095  
    3737
    3838#include "internal/common.h"
    39 #include "strings.h"
     39#include "posix/strings.h"
    4040
    41 #include "string.h"
    42 #include "ctype.h"
     41#include "posix/string.h"
     42#include "posix/ctype.h"
    4343
    4444#include "libc/mem.h"

  • uspace/lib/posix/source/sys/stat.c

    rbe1dcc26 rd948095  
    3737
    3838#include "../internal/common.h"
    39 #include "stat.h"
     39#include "posix/sys/stat.h"
     40#include "libc/sys/stat.h"
    4041
    41 #include "../errno.h"
    42 #include "../libc/mem.h"
     42#include "posix/errno.h"
     43#include "libc/mem.h"
    4344
    4445/**

  • uspace/lib/posix/source/sys/wait.c

    rbe1dcc26 rd948095  
    3737
    3838#include "../internal/common.h"
    39 #include "wait.h"
     39#include "posix/sys/wait.h"
    4040
    41 #include "../libc/task.h"
    42 #include "../assert.h"
    43 #include "../errno.h"
    44 #include "../limits.h"
    45 #include "../signal.h"
     41#include "libc/task.h"
     42#include "posix/assert.h"
     43#include "posix/errno.h"
     44#include "posix/limits.h"
     45#include "posix/signal.h"
    4646
    4747int __posix_wifexited(int status) {

  • uspace/lib/posix/source/time.c

    rbe1dcc26 rd948095  
    3737
    3838/* Must be first. */
    39 #include "stdbool.h"
     39#include "posix/stdbool.h"
    4040
    4141#include "internal/common.h"
    42 #include "time.h"
    43 
    44 #include "ctype.h"
    45 #include "errno.h"
    46 #include "signal.h"
    47 #include "assert.h"
     42#include "posix/time.h"
     43
     44#include "posix/ctype.h"
     45#include "posix/errno.h"
     46#include "posix/signal.h"
     47#include "posix/assert.h"
    4848
    4949#include "libc/malloc.h"

  • uspace/lib/posix/source/unistd.c

    rbe1dcc26 rd948095  
    3737
    3838#include "internal/common.h"
    39 #include "unistd.h"
    40 
    41 #include "errno.h"
    42 #include "string.h"
    43 #include "fcntl.h"
     39#include "posix/unistd.h"
     40
     41#include "posix/errno.h"
     42#include "posix/string.h"
     43#include "posix/fcntl.h"
    4444
    4545#include "libc/task.h"
Note: See TracChangeset for help on using the changeset viewer.