diff options
| author | Dmitry Chestnykh <dm.chestnykh@gmail.com> | 2024-05-16 12:17:08 +0300 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-05-16 11:31:38 +0200 |
| commit | 1e704165de08072edd3a4d891f371bf4ae5e9f03 (patch) | |
| tree | 8e3a6aab5c787fc1bcbe954a73b7075251659e43 | |
| parent | 186878405324e96f61d896a149f623e0c792c972 (diff) | |
Correct uClibc compilation.
- Include sys/types.h instead of asm/types.h
to prevent types conflict for uClibc typedefs and kernel headers
typedefs.
- Cast 3rd arg of utimensat_time64 syscall to integer type
to avoid compiler's -Wint-conversion error. The error was found
during uClibc compilation for mips32.
Signed-off-by: Dmitry Chestnykh <dm.chestnykh@gmail.com>
| -rw-r--r-- | include/net/ppp_defs.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/utimensat.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index f8924c4f2..904d1933c 100644 --- a/include/net/ppp_defs.h +++ b/include/net/ppp_defs.h @@ -4,7 +4,7 @@ #define __need_time_t #include <time.h> -#include <asm/types.h> +#include <sys/types.h> #include <linux/ppp_defs.h> #endif /* net/ppp_defs.h */ diff --git a/libc/sysdeps/linux/common/utimensat.c b/libc/sysdeps/linux/common/utimensat.c index fa6f90e55..5816c7890 100644 --- a/libc/sysdeps/linux/common/utimensat.c +++ b/libc/sysdeps/linux/common/utimensat.c @@ -8,6 +8,7 @@ #include <sys/syscall.h> #include <sys/stat.h> +#include <stdint.h> #if defined(__UCLIBC_USE_TIME64__) #include "internal/time64_helpers.h" @@ -28,7 +29,7 @@ int utimensat(int fd, const char *path, const struct timespec times[2], int flag } }; - return INLINE_SYSCALL(utimensat_time64, 4, fd, path, times ? &__times64 : 0, flags); + return INLINE_SYSCALL(utimensat_time64, 4, fd, path, times ? (uintptr_t) &__times64 : 0, flags); } #else _syscall4(int, utimensat, int, fd, const char *, path, const struct timespec *, times, int, flags) |