Changeset 8ad5470 in mainline for uspace/lib/posix/stdbool.h


Ignore:
Timestamp:
2012-05-24T15:30:53Z (12 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.