diff options
Diffstat (limited to 'lib/common/FileModificationTime.cpp')
| -rw-r--r-- | lib/common/FileModificationTime.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/common/FileModificationTime.cpp b/lib/common/FileModificationTime.cpp index 1109b15f..bc35b7e6 100644 --- a/lib/common/FileModificationTime.cpp +++ b/lib/common/FileModificationTime.cpp @@ -16,7 +16,11 @@ #include "MemLeakFindOn.h" +<<<<<<< HEAD box_time_t FileModificationTime(EMU_STRUCT_STAT &st) +======= +box_time_t FileModificationTime(const EMU_STRUCT_STAT &st) +>>>>>>> 0.12 { #ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC box_time_t datamodified = ((int64_t)st.st_mtime) * (MICRO_SEC_IN_SEC_LL); @@ -28,7 +32,11 @@ box_time_t FileModificationTime(EMU_STRUCT_STAT &st) return datamodified; } +<<<<<<< HEAD box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st) +======= +box_time_t FileAttrModificationTime(const EMU_STRUCT_STAT &st) +>>>>>>> 0.12 { box_time_t statusmodified = #ifdef HAVE_STRUCT_STAT_ST_MTIMESPEC @@ -47,7 +55,11 @@ box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st) return statusmodified; } +<<<<<<< HEAD box_time_t FileModificationTimeMaxModAndAttr(EMU_STRUCT_STAT &st) +======= +box_time_t FileModificationTimeMaxModAndAttr(const EMU_STRUCT_STAT &st) +>>>>>>> 0.12 { #ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC box_time_t datamodified = ((int64_t)st.st_mtime) * (MICRO_SEC_IN_SEC_LL); |