Revert "Upgrade Time::HiRes from version 1.9757 to 1.9758"

This reverts commit 554c20fe6eab1dc262c2fb2d036b76fa09153f1c.

4 files changed, 4 insertions, 38 deletions

diff --git a/dist/Time-HiRes/Changes b/dist/Time-HiRes/Changes
index cc15f37f20..b8413ee5df 100644
--- a/dist/Time-HiRes/Changes
+++ b/dist/Time-HiRes/Changes
@@ -1,15 +1,6 @@
 Revision history for the Perl extension Time::HiRes.
 
-1.9758 [2018-03-21]
- - fix build in Win32 with Visual C by introducing a fake struct timezone
-   [rt.cpan.org #124844]
- - in utime.t detect better being run in a noatime filesystem,
-   and if so, skip the test (for the HAMMER filesystem of DragonflyBSD)
- - also for the HAMMER fs (if not in noatime), lower the expected subsecond
-   timestamp granularity to microseconds
- - fix the version number typo in Changes: 1.9577 -> 1.9757
-
-1.9757 [2018-03-15]
+1.9577 [2018-03-15]
  - fix win32 (and cygwin?) builds which have been broken since 1.9755:
    problem was that gettimeofday() is a macro and needs to stay such
  - regenerate ppport.h with Perl 5.26.1 (was previously generated with
diff --git a/dist/Time-HiRes/HiRes.pm b/dist/Time-HiRes/HiRes.pm
index d9c30d6d79..08d9a03c1f 100644
--- a/dist/Time-HiRes/HiRes.pm
+++ b/dist/Time-HiRes/HiRes.pm
@@ -53,7 +53,7 @@ our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
 		 stat lstat utime
 		);
 
-our $VERSION = '1.9758';
+our $VERSION = '1.9757';
 our $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
diff --git a/dist/Time-HiRes/HiRes.xs b/dist/Time-HiRes/HiRes.xs
index 39ac3fd8f0..a8358dd952 100644
--- a/dist/Time-HiRes/HiRes.xs
+++ b/dist/Time-HiRes/HiRes.xs
@@ -40,14 +40,6 @@ extern "C" {
 }
 #endif
 
-#ifdef _MSC_VER /* For Visual C */
-struct timezone
-{
-   int tz_minuteswest; /* of Greenwich */
-   int tz_dsttime;     /* type of dst correction to apply */
-};
-#endif
-
 #define PERL_VERSION_DECIMAL(r,v,s) (r*1000000 + v*1000 + s)
 #define PERL_DECIMAL_VERSION \
 	PERL_VERSION_DECIMAL(PERL_REVISION,PERL_VERSION,PERL_SUBVERSION)
diff --git a/dist/Time-HiRes/t/utime.t b/dist/Time-HiRes/t/utime.t
index 5a91e7ebce..7fd4604b35 100644
--- a/dist/Time-HiRes/t/utime.t
+++ b/dist/Time-HiRes/t/utime.t
@@ -84,20 +84,9 @@ sub get_mount_of_tempfile {
   return get_mount_of_filesys(get_filesys_of_tempfile());
 }
 
-sub parse_mount_line {
-    my ($dev, $dir, $opt) = ($_[0] =~ m{^(.+) on (.+) \((.+)\)$});
-    my @opt = split(/, /, $opt);
-    return { dev => $dev, dir => $dir, opt => { map { $_ => 1 } @opt } };
-}
-
 sub tempfile_has_noatime_mount {
-  my ($mount) = parse_mount_line(get_mount_of_tempfile());
-  return $mount->{opt}->{noatime};
-}
-
-sub tempfile_has_hammerfs {
-  my ($mount) = parse_mount_line(get_mount_of_tempfile());
-  return $mount->{opt}->{hammer};
+  my ($mount) = get_mount_of_tempfile();
+  return $mount =~ /\bnoatime\b/;
 }
 
 BEGIN {
@@ -147,12 +136,6 @@ print "# \$^O = $^O, atime = $atime, mtime = $mtime\n";
 
 my $skip_atime = $^O eq 'netbsd' && tempfile_has_noatime_mount();
 
-if ($^O eq 'dragonfly' && tempfile_is_hammerfs()) {
-    # The HAMMER fs in DragonflyBSD has microsecond timestamps.
-    $atime = 1.111111;
-    $mtime = 2.222222;
-}
-
 if ($skip_atime) {
   printf("# Skipping atime tests because tempfiles seem to be in a filesystem mounted with 'noatime' ($^O)\n'");
 }