mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-24 03:34:40 +00:00
systemd: drop workaround for missing C11 header <uchar.h>
Now as we build as C11, we can us it.
This commit is contained in:
parent
066357aa47
commit
5f945adfaf
|
@ -1550,7 +1550,6 @@ src_libsystemd_nm_la_SOURCES = \
|
|||
src/systemd/sd-adapt/missing_socket.h \
|
||||
src/systemd/sd-adapt/missing_syscall.h \
|
||||
src/systemd/sd-adapt/missing_timerfd.h \
|
||||
src/systemd/sd-adapt/missing_type.h \
|
||||
src/systemd/sd-adapt/mkdir.h \
|
||||
src/systemd/sd-adapt/procfs-util.h \
|
||||
src/systemd/sd-adapt/raw-clone.h \
|
||||
|
@ -1599,6 +1598,7 @@ src_libsystemd_nm_la_SOURCES = \
|
|||
src/systemd/src/basic/macro.h \
|
||||
src/systemd/src/basic/mempool.c \
|
||||
src/systemd/src/basic/mempool.h \
|
||||
src/systemd/src/basic/missing_type.h \
|
||||
src/systemd/src/basic/parse-util.c \
|
||||
src/systemd/src/basic/parse-util.h \
|
||||
src/systemd/src/basic/path-util.c \
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
/* dummy header */
|
|
@ -44,6 +44,10 @@
|
|||
#define HAVE_SYS_AUXV_H 0
|
||||
#endif
|
||||
|
||||
/* we build with C11 and thus <uchar.h> provides char32_t,char16_t. */
|
||||
#define HAVE_CHAR32_T 1
|
||||
#define HAVE_CHAR16_T 1
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static inline NMLogLevel
|
||||
|
@ -151,12 +155,6 @@ raw_getpid (void) {
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
/* work around missing uchar.h */
|
||||
typedef guint16 char16_t;
|
||||
typedef guint32 char32_t;
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static inline int
|
||||
sd_notify (int unset_environment, const char *state)
|
||||
{
|
||||
|
|
|
@ -5,9 +5,7 @@
|
|||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
#if 0 /* NM_IGNORED */
|
||||
#include <uchar.h>
|
||||
#endif /* NM_IGNORED */
|
||||
|
||||
#include "string-util.h"
|
||||
#include "missing_type.h"
|
||||
|
|
12
src/systemd/src/basic/missing_type.h
Normal file
12
src/systemd/src/basic/missing_type.h
Normal file
|
@ -0,0 +1,12 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
#pragma once
|
||||
|
||||
#include <uchar.h>
|
||||
|
||||
#if !HAVE_CHAR32_T
|
||||
#define char32_t uint32_t
|
||||
#endif
|
||||
|
||||
#if !HAVE_CHAR16_T
|
||||
#define char16_t uint16_t
|
||||
#endif
|
|
@ -4,9 +4,7 @@
|
|||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#if 0 /* NM_IGNORED */
|
||||
#include <uchar.h>
|
||||
#endif /* NM_IGNORED */
|
||||
|
||||
#include "macro.h"
|
||||
#include "missing_type.h"
|
||||
|
|
Loading…
Reference in a new issue