((bool)((LHS)->st_dev ==(RHS)->st_dev && \
(LHS)->st_ino ==(RHS)->st_ino))
-#define Unify_isUnifyable(LHS, RHS) \
+#define _Unify_isUnifyable(LHS, RHS) \
((bool)((LHS)->st_dev ==(RHS)->st_dev && \
(LHS)->st_ino !=(RHS)->st_ino && \
(LHS)->st_mode ==(RHS)->st_mode && \
(LHS)->st_uid ==(RHS)->st_uid && \
(LHS)->st_gid ==(RHS)->st_gid && \
- (LHS)->st_size ==(RHS)->st_size && \
- (LHS)->st_mtime==(RHS)->st_mtime))
+ (LHS)->st_size ==(RHS)->st_size))
+#ifdef UTIL_VSERVER_UNIFY_MTIME_OPTIONAL
+# define Unify_isUnifyable(LHS, RHS) \
+ ((bool)(_Unify_isUnifyable(LHS, RHS) && \
+ (global_args->ignore_mtime || \
+ (LHS)->st_mtime==(RHS)->st_mtime)))
+#else
+# define Unify_isUnifyable(LHS, RHS) \
+ ((bool)(_Unify_isUnifyable(LHS, RHS) && \
+ (LHS)->st_mtime==(RHS)->st_mtime))
+#endif
#endif // H_UTIL_VSERVER_LIB_INTERNAL_UNIFY_H