fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 16:00:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

systemd: don't use <uchar.h>

Browse source 
Not around on Ubuntu 12.04. Define the char16_t and char32_t types
ourselves.

Fixes: 2835934244
This commit is contained in:
Thomas Haller 2016-02-12 17:02:13 +01:00
parent 7ec5acdc66
commit 89e806e1a6
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/systemd/nm-sd-adapt.h
View file

@ -114,6 +114,12 @@ G_STMT_START { \
/*****************************************************************************/
/* work around missing uchar.h */
typedef guint16 char16_t;
typedef guint32 char32_t;
/*****************************************************************************/
/* Can't include both net/if.h and linux/if.h; so have to define this here */
#ifndef IFNAMSIZ
#define IFNAMSIZ 16

2
src/systemd/src/basic/escape.h
View file

@ -25,7 +25,9 @@
#include <stddef.h>
#include <stdint.h>
#include <sys/types.h>
#if 0 /* NM_IGNORED */
#include <uchar.h>
#endif /* NM_IGNORED */
#include "string-util.h"
#if 0 /* NM_IGNORED */

2
src/systemd/src/basic/utf8.h
View file

@ -24,7 +24,9 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#if 0 /* NM_IGNORED */
#include <uchar.h>
#endif /* NM_IGNORED */
#include "macro.h"
#if 0 /* NM_IGNORED */