diff options
| author | Lee Duncan <leeman.duncan@gmail.com> | 2020-04-02 14:16:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 14:16:42 -0700 |
| commit | 0f05a2e46a5d45a55828565a304dde22856e8eed (patch) | |
| tree | f58c4275078e8b013a101c1031133ac25facd702 | |
| parent | 8bf7f0912caf50a72fe1176785513e4f5df422b9 (diff) | |
| parent | a93c2f1cf5a55887074bdda65aa6ad6c533191f0 (diff) | |
| download | open-iscsi-0f05a2e46a5d45a55828565a304dde22856e8eed.tar.gz | |
Merge pull request #201 from gonzoleeman/fix-musl-compiles-v2
Fix musl compiles v2
| -rw-r--r-- | iscsiuio/src/unix/nic_nl.c | 2 | ||||
| -rw-r--r-- | usr/discovery.c | 2 | ||||
| -rw-r--r-- | usr/event_poll.c | 2 | ||||
| -rw-r--r-- | usr/io.c | 2 | ||||
| -rw-r--r-- | usr/iscsi_util.c | 7 | ||||
| -rw-r--r-- | usr/iscsistart.c | 1 | ||||
| -rw-r--r-- | usr/mgmt_ipc.c | 1 | ||||
| -rw-r--r-- | usr/netlink.c | 2 | ||||
| -rw-r--r-- | usr/statics.c | 3 |
9 files changed, 12 insertions, 10 deletions
diff --git a/iscsiuio/src/unix/nic_nl.c b/iscsiuio/src/unix/nic_nl.c index f830656..dee462e 100644 --- a/iscsiuio/src/unix/nic_nl.c +++ b/iscsiuio/src/unix/nic_nl.c @@ -50,7 +50,7 @@ #include <linux/netlink.h> #include <iscsi_if.h> #include <sys/ioctl.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/types.h> #include <sys/user.h> #include <sys/socket.h> diff --git a/usr/discovery.c b/usr/discovery.c index 9ce122e..7dec696 100644 --- a/usr/discovery.c +++ b/usr/discovery.c @@ -25,7 +25,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/time.h> #include <sys/param.h> #include <sys/socket.h> diff --git a/usr/event_poll.c b/usr/event_poll.c index 4cf4ce2..ffd12a3 100644 --- a/usr/event_poll.c +++ b/usr/event_poll.c @@ -23,7 +23,7 @@ */ #include <stdlib.h> #include <errno.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/types.h> #include <sys/wait.h> #include <sys/signalfd.h> @@ -24,7 +24,7 @@ #include <signal.h> #include <unistd.h> #include <fcntl.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #include <netinet/tcp.h> #include <arpa/inet.h> diff --git a/usr/iscsi_util.c b/usr/iscsi_util.c index fd8fc0c..db1dc37 100644 --- a/usr/iscsi_util.c +++ b/usr/iscsi_util.c @@ -152,7 +152,9 @@ int increase_max_files(void) log_debug(1, "Could not get file limit (err %d)", errno); return errno; } - log_debug(1, "Max file limits %lu %lu", rl.rlim_cur, rl.rlim_max); + log_debug(1, "Max file limits %lu %lu", + (long unsigned)rl.rlim_cur, + (long unsigned)rl.rlim_max); if (rl.rlim_cur < ISCSI_MAX_FILES) rl.rlim_cur = ISCSI_MAX_FILES; @@ -162,7 +164,8 @@ int increase_max_files(void) err = setrlimit(RLIMIT_NOFILE, &rl); if (err) { log_debug(1, "Could not set file limit to %lu/%lu (err %d)", - rl.rlim_cur, rl.rlim_max, errno); + (long unsigned)rl.rlim_cur, + (long unsigned)rl.rlim_max, errno); return errno; } diff --git a/usr/iscsistart.c b/usr/iscsistart.c index 00a9c78..ee810f7 100644 --- a/usr/iscsistart.c +++ b/usr/iscsistart.c @@ -30,7 +30,6 @@ #include <time.h> #include <sys/mman.h> #include <sys/utsname.h> -#include <sys/signal.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/usr/mgmt_ipc.c b/usr/mgmt_ipc.c index 51267c1..c292161 100644 --- a/usr/mgmt_ipc.c +++ b/usr/mgmt_ipc.c @@ -26,6 +26,7 @@ #include <unistd.h> #include <pwd.h> #include <sys/un.h> +#include <string.h> #include "iscsid.h" #include "idbm.h" diff --git a/usr/netlink.c b/usr/netlink.c index d42ca4f..22cad83 100644 --- a/usr/netlink.c +++ b/usr/netlink.c @@ -30,7 +30,7 @@ #include <asm/types.h> #include <sys/socket.h> #include <sys/types.h> -#include <sys/poll.h> +#include <poll.h> #include <linux/netlink.h> #include "types.h" diff --git a/usr/statics.c b/usr/statics.c index 59fb044..f59729b 100644 --- a/usr/statics.c +++ b/usr/statics.c @@ -1,6 +1,6 @@ #include <unistd.h> #include <pwd.h> -#include <sys/errno.h> +#include <errno.h> #include <sys/types.h> static struct passwd root_pw = { @@ -17,4 +17,3 @@ getpwuid(uid_t uid) return 0; } } - |