summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-28 08:27:04 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-28 08:27:04 +0000
commitb69ad8681a798725c201c7914539b95f03d0c923 (patch)
tree6175a82bb78205b6e01646687380a47a90d5e04c /Build/source/utils
parent6ac7c9f0eaaa12ff3aae71060642bbf79b40af47 (diff)
psutils: Build fix for WIN32, from Akira
git-svn-id: svn://tug.org/texlive/trunk@32021 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r--Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog4
-rw-r--r--Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN326
-rw-r--r--Build/source/utils/psutils/psutils-1.21/psutil.h4
3 files changed, 9 insertions, 5 deletions
diff --git a/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog b/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog
index 89455af35fa..efff6bdb7dd 100644
--- a/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog
+++ b/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-11-WIN32: Adapt to Visual Studio 2010 (from Akira).
+
2013-10-25 Peter Breitenlohner <peb@mppmu.mpg.de>
Import psutils-1.21.
diff --git a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32 b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32
index a30f877cfad..e811d4b31b4 100644
--- a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32
+++ b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32
@@ -1,6 +1,6 @@
diff -ur psutils-1.21.orig/psutil.h psutils-1.21/psutil.h
--- psutils-1.21.orig/psutil.h 2013-10-25 13:06:05.000000000 +0200
-+++ psutils-1.21/psutil.h 2013-10-25 13:29:41.000000000 +0200
++++ psutils-1.21/psutil.h 2013-10-28 09:20:42.000000000 +0100
@@ -26,6 +26,18 @@
#include <io.h>
#include <fcntl.h>
@@ -14,8 +14,8 @@ diff -ur psutils-1.21.orig/psutil.h psutils-1.21/psutil.h
+#define fseeko fseeko64
+#else
+#define off_t __int64
-+#define xfseeko xfseek64
-+#define xftello xftell64
++#define xftello _ftelli64
++#define xfseeko _fseeki64
+#endif
#else /* !WIN32 */
#define SET_BINARY(fp) (void)0
diff --git a/Build/source/utils/psutils/psutils-1.21/psutil.h b/Build/source/utils/psutils/psutils-1.21/psutil.h
index 4cd2f22eebb..498e1a743ff 100644
--- a/Build/source/utils/psutils/psutils-1.21/psutil.h
+++ b/Build/source/utils/psutils/psutils-1.21/psutil.h
@@ -35,8 +35,8 @@
#define fseeko fseeko64
#else
#define off_t __int64
-#define xfseeko xfseek64
-#define xftello xftell64
+#define xftello _ftelli64
+#define xfseeko _fseeki64
#endif
#else /* !WIN32 */
#define SET_BINARY(fp) (void)0