Changeset 5d4e90f0 in mainline for uspace/lib/libc/include


Ignore:
Timestamp:
2007-09-27T12:35:36Z (18 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bcf23cf
Parents:
8c20b26
Message:

Header cleanup.
Move off_t, size_t and ssize_t into sys/types.h.
Get rid off the non-standard and dummy types.h.

Location:
uspace/lib/libc/include
Files:
1 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/libc/include/as.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_AS_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939#include <task.h>
    4040#include <kernel/mm/as.h>

  • uspace/lib/libc/include/async.h

    r8c20b26 r5d4e90f0  
    5656
    5757aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
    58                    ipc_call_t *dataptr);
     58    ipc_call_t *dataptr);
    5959aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
    60                    ipcarg_t arg3, ipc_call_t *dataptr);
     60    ipcarg_t arg3, ipc_call_t *dataptr);
    6161void async_wait_for(aid_t amsgid, ipcarg_t *result);
    6262int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout);
    … …  
    6868 * @return Return code of message
    6969 */
    70 static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2)
     70static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1,
     71    ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2)
    7172{
    7273        ipc_call_t result;
    … …  
    8182        return rc;
    8283}
    83 #define async_req(phoneid, method, arg1, r1) async_req_2(phoneid, method, arg1, 0, r1, 0)
     84#define async_req(phoneid, method, arg1, r1) \
     85    async_req_2(phoneid, method, arg1, 0, r1, 0)
    8486
    8587static inline ipcarg_t async_req_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
    86                                    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1,
    87                                    ipcarg_t *r2, ipcarg_t *r3)
     88    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1, ipcarg_t *r2, ipcarg_t *r3)
    8889{
    8990        ipc_call_t result;
    … …  
    114115/* Primitve functions for IPC communication */
    115116void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
    116                 ipcarg_t arg3);
     117    ipcarg_t arg3);
    117118void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2);
    118119#define async_msg(ph, m, a1) async_msg_2(ph, m, a1, 0)

  • uspace/lib/libc/include/bitops.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_BITOPS_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939
    4040

  • uspace/lib/libc/include/futex.h

    r8c20b26 r5d4e90f0  
    3737
    3838#include <atomic.h>
    39 #include <types.h>
     39#include <sys/types.h>
    4040
    4141#define FUTEX_INITIALIZER     {1}

  • uspace/lib/libc/include/io/io.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_IO_H_
    3737
    38 #include <libarch/types.h>
     38#include <sys/types.h>
    3939
    4040int putnchars(const char * buf, size_t count);

  • uspace/lib/libc/include/io/printf_core.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_PRINTF_CORE_H_
    3737
    38 #include <libarch/types.h>
     38#include <sys/types.h>
    3939#include <stdarg.h>
    4040

  • uspace/lib/libc/include/ipc/ipc.h

    r8c20b26 r5d4e90f0  
    3939#include <kernel/ddi/irq.h>
    4040#include <libc.h>
    41 #include <types.h>
     41#include <sys/types.h>
    4242#include <kernel/synch/synch.h>
    4343

  • uspace/lib/libc/include/libc.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_LIBC_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939#include <kernel/syscall/syscall.h>
    4040#include <libarch/syscall.h>

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

    r8c20b26 r5d4e90f0  
    3636#define LIBC_STDARG_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939#include <libarch/stackarg.h>
    4040

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

    r8c20b26 r5d4e90f0  
    3636#define LIBC_STDDEF_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939
    4040#endif

  • uspace/lib/libc/include/stdint.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_STDINT_H_
    3737
    38 /* Definitions of types with fixed size*/
    39 #include <types.h>
     38/* Definitions of types with fixed size */
     39#include <libarch/types.h>
    4040
    4141#define MAX_INT8 (0x7F)

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

    r8c20b26 r5d4e90f0  
    3636#define LIBC_STDIO_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939#include <stdarg.h>
    4040

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

    r8c20b26 r5d4e90f0  
    3636#define LIBC_STRING_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939
    4040#define bzero(ptr, len) memset((ptr), 0, (len))

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

    r8c20b26 r5d4e90f0  
    3737
    3838#include <as.h>
     39#include <sys/types.h>
    3940
    4041#define MAP_FAILED  ((void *) -1)
    … …  
    4950#define PROTO_EXEC   AS_AREA_EXEC
    5051
    51 extern void  *mmap(void  *start, size_t length, int prot, int flags, int fd,
    52                    off_t offset);
     52extern void *mmap(void  *start, size_t length, int prot, int flags, int fd,
     53    off_t offset);
    5354extern int munmap(void *start, size_t length);
    5455

  • uspace/lib/libc/include/sys/time.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_TIME_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939
    4040#define DST_NONE 0

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

    r8c20b26 r5d4e90f0  
    3636#define LIBC_SYS_TYPES_H_
    3737
    38 #include <types.h>
     38#include <libarch/types.h>
     39
     40typedef unsigned long size_t;
     41typedef signed long ssize_t;
     42typedef long off_t;
    3943
    4044#endif

  • uspace/lib/libc/include/syscall.h

    r8c20b26 r5d4e90f0  
    3838#define LIBC_SYSCALL_H_
    3939
    40 #include <types.h>
     40#include <sys/types.h>
    4141#include <kernel/syscall/syscall.h>
    4242

  • uspace/lib/libc/include/task.h

    r8c20b26 r5d4e90f0  
    3636#define LIBC_TASK_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939
    4040typedef uint64_t task_id_t;

  • uspace/lib/libc/include/thread.h

    r8c20b26 r5d4e90f0  
    3838#include <kernel/proc/uarg.h>
    3939#include <libarch/thread.h>
    40 #include <types.h>
     40#include <sys/types.h>
    4141
    4242typedef uint64_t thread_id_t;

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

    r8c20b26 r5d4e90f0  
    3636#define LIBC_UNISTD_H_
    3737
    38 #include <types.h>
     38#include <sys/types.h>
    3939#include <libarch/config.h>
    4040
Note: See TracChangeset for help on using the changeset viewer.