Ignore:
Timestamp:
2019-02-11T22:31:04Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (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:

merging with upstream/master

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/arm32/include/libarch/rtld/dynamic.h

    re3272101 rd5a89a3  
    11/*
    2  * Copyright (c) 2018 Jaroslav Jindrak
     2 * Copyright (c) 2019 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 #ifndef LIBCPP_BITS_COMMON
    30 #define LIBCPP_BITS_COMMON
     29/** @addtogroup libc
     30 * @{
     31 */
     32/** @file
     33 */
    3134
    32 /**
    33  * According to section 17.2 of the standard,
    34  * the restrict qualifier shall be omitted.
    35  */
    36 #define restrict
     35#ifndef _LIBC_arm32_RTLD_DYNAMIC_H_
     36#define _LIBC_arm32_RTLD_DYNAMIC_H_
    3737
    38 #undef NULL
    39 #define NULL nullptr
     38typedef struct {
     39        /* Empty. */
     40} dyn_info_arch_t;
    4041
    4142#endif
     43
     44/** @}
     45 */
Note: See TracChangeset for help on using the changeset viewer.