diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | screen.cpp | 23 |
2 files changed, 12 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 150591af..1b91f962 100644 --- a/configure.ac +++ b/configure.ac @@ -396,6 +396,11 @@ AC_CHECK_HEADER( [AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])] ) +# +# Detect nanoseconds fields in struct stat +# +AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec]) +AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec]) # # On some platforms (Solaris 10) adding -std=c99 in turn requires that @@ -379,17 +379,6 @@ static size_t calc_prompt_lines(const wcstring &prompt) } return result; } -/** - Test if there is space between the time fields of struct stat to - use for sub second information. If so, we assume this space - contains the desired information. -*/ -static int room_for_usec(struct stat *st) -{ - int res = ((&(st->st_atime) + 2) == &(st->st_mtime) && - (&(st->st_atime) + 4) == &(st->st_ctime)); - return res; -} /** Stat stdout and stderr and save result. @@ -456,11 +445,13 @@ static void s_check_status(screen_t *s) int changed = (s->prev_buff_1.st_mtime != s->post_buff_1.st_mtime) || (s->prev_buff_2.st_mtime != s->post_buff_2.st_mtime); - if (room_for_usec(&s->post_buff_1)) - { - changed = changed || ((&s->prev_buff_1.st_mtime)[1] != (&s->post_buff_1.st_mtime)[1]) || - ((&s->prev_buff_2.st_mtime)[1] != (&s->post_buff_2.st_mtime)[1]); - } + #if defined HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC + changed = changed || s->prev_buff_1.st_mtimespec.tv_nsec != s->post_buff_1.st_mtimespec.tv_nsec || + s->prev_buff_2.st_mtimespec.tv_nsec != s->post_buff_2.st_mtimespec.tv_nsec; + #elif defined HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC + changed = changed || s->prev_buff_1.st_mtim.tv_nsec != s->post_buff_1.st_mtim.tv_nsec || + s->prev_buff_2.st_mtim.tv_nsec != s->post_buff_2.st_mtim.tv_nsec; + #endif if (changed) { |