Merge fcd27ddb2d into 75dcdc2cf3

2024-02-24 09:42:58 +00:00 · 2024-02-24 09:42:58 +00:00 · 35697b67fc
parent 75dcdc2cf3 fcd27ddb2d
commit 35697b67fc
2 changed files with 3 additions and 1 deletions
--- a/include/ntfs-3g/ntfstime.h
+++ b/include/ntfs-3g/ntfstime.h
@ -39,7 +39,7 @@
 /*
 * assume "struct timespec" is not defined if st_mtime is not defined
 */
-#if !defined(st_mtime) & !defined(__timespec_defined)
+#if !defined(st_mtime)
 struct timespec {
 	time_t tv_sec;
 	long tv_nsec;
--- a/libntfs-3g/ioctl.c
+++ b/libntfs-3g/ioctl.c
@ -48,7 +48,9 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif