summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-28 09:42:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-28 09:42:50 +0000
commita8a2a23f5fd339daf7483fe627ded4dc94dfc21c (patch)
tree62d0490b37bfa74e35582fee0bfdae8881536fe5 /Build/source/utils
parentb69ad8681a798725c201c7914539b95f03d0c923 (diff)
psutils: Build fix for WIN32, from Akira
git-svn-id: svn://tug.org/texlive/trunk@32022 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-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
2 files changed, 5 insertions, 5 deletions
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 e811d4b31b4..2490a1b0642 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-28 09:20:42.000000000 +0100
++++ psutils-1.21/psutil.h 2013-10-28 10:39:53.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 xftello _ftelli64
-+#define xfseeko _fseeki64
++#define ftello _ftelli64
++#define fseeko _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 498e1a743ff..abddc0bb7c1 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 xftello _ftelli64
-#define xfseeko _fseeki64
+#define ftello _ftelli64
+#define fseeko _fseeki64
#endif
#else /* !WIN32 */
#define SET_BINARY(fp) (void)0