# HG changeset patch # User Michael Pavone # Date 1462348593 25200 # Node ID f1fd9263ccec8ece7afad2c3c43608b60684215a # Parent 4803f0246d2755c16829a8f68a48177e6a748684# Parent 3f5b94f3c9224c0ee9f7dd6878fd7aa308207f98 Merge diff -r 3f5b94f3c922 -r f1fd9263ccec .hgtags --- a/.hgtags Mon May 02 23:38:27 2016 -0700 +++ b/.hgtags Wed May 04 00:56:33 2016 -0700 @@ -4,4 +4,4 @@ 0e5f14d9a57990a2c449a0d7c93250bbb4f6b9e5 v0.3.0 283bdcd5bdb8cacaef8da9dfc72c56f6686dca29 v0.3.0 c9ed929ee9848de216e8d87f577b2be0e11637d9 v0.3.1 -e34334e6c682ff8380e0bdb368a5457af36cf440 v0.4.0 +4a92889e2889bc3d7c2522a9e205d837d06bf59b v0.4.0 diff -r 3f5b94f3c922 -r f1fd9263ccec util.c --- a/util.c Mon May 02 23:38:27 2016 -0700 +++ b/util.c Wed May 04 00:56:33 2016 -0700 @@ -467,7 +467,11 @@ if (stat(path, &st)) { return 0; } +#ifdef __APPLE__ + return st.st_mtimespec.tv_sec; +#else return st.st_mtim.tv_sec; +#endif } int ensure_dir_exists(char *path)