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 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia32/include/libarch/stddef.h

    r3feeab2 rff381a7  
    11/*
    2  * Copyright (c) 2010 Lenka Trochtova
     2 * Copyright (c) 2006 Ondrej Palkovsky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libdrv
     29/** @addtogroup libcia32
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef IPC_DRIVER_H_
    36 #define IPC_DRIVER_H_
     35#ifndef LIBC_ia32_STDDEF_H_
     36#define LIBC_ia32_STDDEF_H_
    3737
    38 typedef enum {
    39         DRIVER_DEVMAN = 1,
    40         DRIVER_CLIENT,
    41         DRIVER_DRIVER
    42 } driver_interface_t;
     38#include <libarch/common.h>
    4339
     40typedef uint32_t size_t;
     41typedef int32_t ptrdiff_t;
    4442
    4543#endif
    4644
    47 
    48 /**
    49  * @}
     45/** @}
    5046 */
Note: See TracChangeset for help on using the changeset viewer.