* win32.h (FACTOR): Define, use correct value.

	(NSPERSEC): Ditto.
	* archive_tar.cc: Drop FACTOR and NSPERSEC definitions here.
	* io_stream_cygfile.cc: Ditto.
	* io_stream_file.cc: Ditto.

diff --git a/ChangeLog b/ChangeLog
index 942578f1023e13bd8f9ea94eed8014d28440e109..f9452ca15cdde1b94a23360a136ae928b46ac760 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-08  Corinna Vinschen  <corinna@vinschen.de>
+
+       * win32.h (FACTOR): Define, use correct value.
+       (NSPERSEC): Ditto.
+       * archive_tar.cc: Drop FACTOR and NSPERSEC definitions here.
+       * io_stream_cygfile.cc: Ditto.
+       * io_stream_file.cc: Ditto.
+
 2012-02-29  Corinna Vinschen  <corinna@vinschen.de>
 
        * win32.cc (NTSecurity::GetPosixPerms): Don't allow write permissions

diff --git a/archive_tar.cc b/archive_tar.cc
index fbe8c9e63668a2bf7dc56d8da6d5f07de774f78d..789b03c963132e0e21809d2ebe995219820ee4b2 100644 (file)
--- a/archive_tar.cc
+++ b/archive_tar.cc
@@ -29,6 +29,7 @@ static const char *cvsid =
 //#include "zlib/zlib.h"
 #include "io_stream.h"
 //#include "compress.h"
+#include "win32.h"
 #include "archive.h"
 #include "archive_tar.h"
 #include "mkdir.h"
@@ -39,8 +40,6 @@ static const char *cvsid =
 #undef _WIN32
 #include "bzlib.h"
 
-#define FACTOR (0x19db1ded53ea710LL)
-#define NSPERSEC 10000000LL
 #define SYMLINK_COOKIE "!<symlink>"
 #endif
 static int err;

diff --git a/io_stream_cygfile.cc b/io_stream_cygfile.cc
index 44ddec23477758f72dbc67b5189f5f2978b7e0c4..2d3874da826c9e18addf7f840b423e4a6df71039 100644 (file)
--- a/io_stream_cygfile.cc
+++ b/io_stream_cygfile.cc
@@ -66,10 +66,6 @@ private:
 CygFileProvider CygFileProvider::theInstance = CygFileProvider();
 
 
-/* For set mtime */
-#define FACTOR (0x19db1ded53ea710LL)
-#define NSPERSEC 10000000LL
-
 std::string io_stream_cygfile::cwd("/");
   
 // Normalise a unix style path relative to 

diff --git a/io_stream_file.cc b/io_stream_file.cc
index 2efbca14ed1f6587a3b8bfc715d99261ffed5701..031fca0de5dca9e5a9cce33389cd2b1a76237050 100644 (file)
--- a/io_stream_file.cc
+++ b/io_stream_file.cc
@@ -71,11 +71,6 @@ private:
 };
 FileProvider FileProvider::theInstance = FileProvider();
   
-
-/* for set_mtime */
-#define FACTOR (0x19db1ded53ea710LL)
-#define NSPERSEC 10000000LL
-
 wchar_t *
 io_stream_file::w_str ()
 {

diff --git a/win32.h b/win32.h
index 57a71253ee740f369e675e66c3a8971df21f3594..08f45566bc835f735a55c0aab8df536c185bbbf7 100644 (file)
--- a/win32.h
+++ b/win32.h
@@ -32,6 +32,11 @@
 #define NOMINMAX
 #endif
 
+/* 100ns difference between Windows and UNIX timebase. */
+#define FACTOR (0x19db1ded53e8000LL)
+/* # of 100ns intervals per second. */
+#define NSPERSEC 10000000LL
+
 /* In w32api 3.1, __declspec(dllimport) decoration is added to
  * certain symbols. This breaks our autoload mechanism - the symptom is
  * multiple declaration errors at link time. This define turns that off again.