Skip to content

Commit a6060e5

Browse files
committed
Merge branch 'github-pull-45'
These issues were found during an attempt to build make-initrd with musl libc. Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
2 parents 094894a + 1f6a92d commit a6060e5

File tree

5 files changed

+4
-1
lines changed

5 files changed

+4
-1
lines changed

runtime/src/halt/hddown.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const char *v_hddown = "@(#)hddown.c 1.02 22-Apr-2003 miquels@cistron.nl";
1717
#include <string.h>
1818
#include <fcntl.h>
1919
#include <dirent.h>
20+
#include <libgen.h>
2021

2122
#include <sys/ioctl.h>
2223
#include <linux/hdreg.h>

runtime/src/libinitramfs/memory.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <stdarg.h>
66
#include <stdio.h>
77
#include <errno.h>
8-
#include <error.h>
98
#include <limits.h>
109

1110
#include "rd/memory.h"

utils/initrd-put/initrd-put.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <fcntl.h>
2121
#include <ctype.h>
2222
#include <regex.h>
23+
#include <string.h>
2324

2425
#include "config.h"
2526
#include "memory.h"

utils/initrd-put/queue.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#define __INITRD_PUT_QUEUE_H__
44

55
#include <sys/stat.h>
6+
#include <sys/types.h>
67
#include <stdbool.h>
78

89
struct file {

utils/initrd-scanmod/initrd-scanmod.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <getopt.h>
1010
#include <ctype.h>
1111
#include <err.h>
12+
#include <libgen.h>
1213

1314
#include "initrd-scanmod.h"
1415
#include "config.h"

0 commit comments

Comments
 (0)