summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-25 08:04:52 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-25 08:04:52 +0000
commit89d3a721c9e9bc8972b047ef198b94e77d225658 (patch)
tree7f6eef4a7d640c3e9a5a5427aa7f10c083883aef
parent576aecf55169a363532f3ff3c1e017f5a160fea4 (diff)
texk/web2c: Bug fix: integer64 must always a be 64bit type (detected by Norbert Preinig)
git-svn-id: svn://tug.org/texlive/trunk@35253 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/w2c/config.h8
2 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 59364986990..f3538016a91 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * w2c/config.h: Bug fix: integer64 must always a be 64bit type,
+ even when long and off_t are not (detected by Norbert Preinig).
+
2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Include fragments libmputil.am and pmpost.am.
diff --git a/Build/source/texk/web2c/w2c/config.h b/Build/source/texk/web2c/w2c/config.h
index 9aa4a96237f..d3f15e8f09a 100644
--- a/Build/source/texk/web2c/w2c/config.h
+++ b/Build/source/texk/web2c/w2c/config.h
@@ -93,8 +93,12 @@ typedef off_t longinteger;
#define LONGINTEGER_PRI "l"
#endif
-/* We also need a genuine 64-bit integer type, in case of 32-bit off_t */
-typedef LONGINTEGER_TYPE integer64;
+/* We also need a genuine 64-bit integer type. */
+#if defined(WIN32)
+typedef __int64 integer64;
+#else
+typedef int64_t integer64;
+#endif
/* I don't want to write a configure test for remove when all Unix
machines have unlink. But, for the sake of non-Unix machines that