Changeset 2b3dd78 in mainline for boot/generic/include/printf_verify.h


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/generic/include/printf_verify.h

    ra0a9cc2 r2b3dd78  
    3333#define BOOT_PRINTF_VERIFY_H_
    3434
    35 #ifndef NVERIFY_PRINTF
     35#ifndef _HELENOS_NVERIFY_PRINTF
    3636
    37 #define PRINTF_ATTRIBUTE(start, end) \
     37#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    3838        __attribute__((format(gnu_printf, start, end)))
    3939
    40 #else /* NVERIFY_PRINTF */
     40#else /* _HELENOS_NVERIFY_PRINTF */
    4141
    42 #define PRINTF_ATTRIBUTE(start, end)
     42#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    4343
    44 #endif /* NVERIFY_PRINTF */
     44#endif /* _HELENOS_NVERIFY_PRINTF */
    4545
    4646#endif
Note: See TracChangeset for help on using the changeset viewer.