Ignore:
Timestamp:
2015-11-02T20:54:19Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d8513177
Parents:
3feeab2 (diff), 5265eea4 (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/c/arch/ia64/include/libarch/stddef.h

    r3feeab2 rff381a7  
    11/*
    2  * Copyright (c) 2012 Frantisek Princ
     2 * Copyright (c) 2006 Ondrej Palkovsky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libext4
     29/** @addtogroup libcia64
    3030 * @{
    3131 */
     32/** @file
     33 */
    3234
    33 #ifndef LIBEXT4_LIBEXT4_CRC_H_
    34 #define LIBEXT4_LIBEXT4_CRC_H_
     35#ifndef LIBC_ia64_STDDEF_H_
     36#define LIBC_ia64_STDDEF_H_
    3537
    36 extern uint16_t crc16(uint16_t, const uint8_t *, size_t);
     38#include <libarch/common.h>
     39
     40typedef uint64_t size_t;
     41typedef int64_t ptrdiff_t;
    3742
    3843#endif
    3944
    40 /**
    41  * @}
     45/** @}
    4246 */
Note: See TracChangeset for help on using the changeset viewer.