Changeset 26e7d6d in mainline for uspace/lib/posix/stddef.h


Ignore:
Timestamp:
2011-09-19T16:31:00Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (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

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/posix/stddef.h

    r3842a955 r26e7d6d  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2011 Petr Koupy
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libc
     29/** @addtogroup libposix
    3030 * @{
    3131 */
    32 /** @file
     32/** @file Standard type definitions.
    3333 */
    3434
    35 #ifndef LIBC_DEVMAP_OBSOLETE_H_
    36 #define LIBC_DEVMAP_OBSOLETE_H_
     35#ifndef POSIX_STDDEF_H_
     36#define POSIX_STDDEF_H_
    3737
    38 #include <ipc/devmap.h>
    39 #include <async.h>
    40 #include <bool.h>
     38#include "libc/stddef.h"
    4139
    42 extern int devmap_obsolete_get_phone(devmap_interface_t, unsigned int);
    43 extern void devmap_obsolete_hangup_phone(devmap_interface_t iface);
     40#ifndef NULL
     41        #define NULL  ((void *) 0)
     42#endif
    4443
    45 extern int devmap_obsolete_device_connect(devmap_handle_t, unsigned int);
     44#define offsetof(type,member) ((size_t) &(((type *) 0)->member))
    4645
     46typedef ssize_t posix_ptrdiff_t;
     47
     48#ifndef LIBPOSIX_INTERNAL
     49        #define ptrdiff_t posix_ptrdiff_t
    4750#endif
     51
     52#endif /* POSIX_STDDEF_H_ */
    4853
    4954/** @}
Note: See TracChangeset for help on using the changeset viewer.