diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /src/systemd/nm-sd-adapt.h | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'src/systemd/nm-sd-adapt.h')
| -rw-r--r-- | src/systemd/nm-sd-adapt.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 967cb48f..f48c86f1 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -19,15 +19,13 @@ #ifndef NM_SD_ADAPT_H #define NM_SD_ADAPT_H -#include "config.h" +#include "nm-default.h" #include <stdbool.h> #include <syslog.h> #include <sys/resource.h> #include <time.h> -#include "nm-default.h" - #define noreturn G_GNUC_NORETURN #ifndef CLOCK_BOOTTIME @@ -114,6 +112,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 |