Ignore:
Timestamp:
2015-11-02T20:54:19Z (8 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 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia64/include/libarch/types.h

    r3feeab2 rff381a7  
    3636#define LIBC_ia64_TYPES_H_
    3737
     38#include <libarch/common.h>
     39#include <libarch/stddef.h>
     40#include <libarch/stdint.h>
     41
    3842#define __64_BITS__
    39 
    40 #include <libarch/common.h>
    41 
    42 #define SIZE_MIN  UINT64_MIN
    43 #define SIZE_MAX  UINT64_MAX
    4443
    4544#define SSIZE_MIN  INT64_MIN
     
    5049
    5150typedef int64_t ssize_t;
    52 typedef uint64_t size_t;
    5351
    54 typedef uint64_t uintptr_t;
    55 typedef int64_t intptr_t;
    5652typedef uint64_t atomic_count_t;
    5753typedef int64_t atomic_signed_t;
Note: See TracChangeset for help on using the changeset viewer.