diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-04-17 15:49:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 15:49:06 +0200 |
| commit | 948a3241ded51c47e32b5b5e91173c2dd8010929 (patch) | |
| tree | 9beefbe0049f92270a45fd1ac471ce50bc02f866 /src | |
| parent | Merge pull request #5731 from jprvita/hwdb-acer (diff) | |
| parent | build-sys: correct blkid.h includes (diff) | |
| download | systemd-948a3241ded51c47e32b5b5e91173c2dd8010929.tar.xz systemd-948a3241ded51c47e32b5b5e91173c2dd8010929.zip | |
Merge pull request #5708 from vcatechnology/arm-cross-compile
ARM32 cross-compile fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/blkid-util.h | 2 | ||||
| -rw-r--r-- | src/boot/bootctl.c | 2 | ||||
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 2 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-builtin-blkid.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/basic/blkid-util.h b/src/basic/blkid-util.h index 7aa75eb091..1b9cace040 100644 --- a/src/basic/blkid-util.h +++ b/src/basic/blkid-util.h @@ -20,7 +20,7 @@ ***/ #ifdef HAVE_BLKID -#include <blkid/blkid.h> +#include <blkid.h> #endif #include "util.h" diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 155bf278b2..3358dc32a5 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -19,7 +19,7 @@ ***/ #include <assert.h> -#include <blkid/blkid.h> +#include <blkid.h> #include <ctype.h> #include <dirent.h> #include <errno.h> diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 80f676e477..3578e2513c 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <blkid/blkid.h> +#include <blkid.h> #include <stdlib.h> #include <sys/statfs.h> #include <unistd.h> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index bce26a383b..fd00d0957a 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -18,7 +18,7 @@ ***/ #ifdef HAVE_BLKID -#include <blkid/blkid.h> +#include <blkid.h> #endif #include <errno.h> #include <getopt.h> diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index 9037aa1304..6319403620 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <blkid/blkid.h> +#include <blkid.h> #include <errno.h> #include <fcntl.h> #include <getopt.h> |