Changeset 3e828ea in mainline for abi/include/_bits/NULL.h


Ignore:
Timestamp:
2019-09-23T12:49:29Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (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.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

File:
1 edited

Legend:

Unmodified
Added
Removed

  • abi/include/_bits/NULL.h

    r9259d20 r3e828ea  
    3737/** @file
    3838 * Definition of constant NULL.
    39  *
    40  * This definition is designed to work in both C and C++, and use
    41  * the special constant `nullptr` in C++11 and above.
    42  * Including this file is preferrable to defining the constant separately.
    4339 */
    4440
    … …  
    4642#define _BITS_NULL_H_
    4743
    48 #ifndef NULL
    49 
    50 #if __cplusplus >= 201103L
    51 #define NULL  nullptr
    52 #elif defined(__cplusplus)
    53 #define NULL  0L
    54 #else
    55 #define NULL  ((void *) 0)
    56 #endif
    57 
    58 #endif
     44#define __need_NULL
     45#include <stddef.h>
    5946
    6047#endif
Note: See TracChangeset for help on using the changeset viewer.