Ignore:
Timestamp:
2011-02-09T11:46:47Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb15135a
Parents:
a49c4002 (diff), 0b37882 (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

Local modifications:

  • change pipefs and ext2 to build again (use async_* calls instead of ipc_*)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/mips32/include/inttypes.h

    ra49c4002 rcf2af94  
    3434#define LIBC_mips32_INTTYPES_H_
    3535
    36 #define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
    37 #define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
    38 #define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     36#define PRIdn  PRId32  /**< Format for native_t. */
     37#define PRIun  PRIu32  /**< Format for sysarg_t. */
     38#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
    3939#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    4040
Note: See TracChangeset for help on using the changeset viewer.