summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-09-18 17:11:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-09-18 17:11:21 +0000
commita0bae0b4bddbe678140c83ecc936dafcd2bf1849 (patch)
treeae9b0d10ee18fe51947be2596b18c15a0fb4b721 /Build/source/texk/dvipng
parentc4d697be7f7089aae27a093fcd55aa734f43d753 (diff)
dvipng: Adapt to W32TeX
git-svn-id: svn://tug.org/texlive/trunk@27691 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN327
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14/special.c1
3 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
index 6c49a50b0e4..a60eb1bc448 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-06-WIN32: Avoid warning when redefining pipe.
+
2012-08-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-06-WIN32: Do not redefine snprintf, handled by kpathsea.
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32 b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32
index f721629d983..0107043ab5c 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32
@@ -1,6 +1,6 @@
diff -ur dvipng-1.14.orig/dvipng.c dvipng-1.14/dvipng.c
--- dvipng-1.14.orig/dvipng.c 2008-02-08 14:45:25.000000000 +0100
-+++ dvipng-1.14/dvipng.c 2011-08-03 13:34:43.000000000 +0200
++++ dvipng-1.14/dvipng.c 2011-08-03 13:34:44.000000000 +0200
@@ -79,6 +79,10 @@
kpse_set_program_enabled (kpse_pk_format, makeTexPK, kpse_src_compile);
#endif
@@ -14,14 +14,15 @@ diff -ur dvipng-1.14.orig/dvipng.c dvipng-1.14/dvipng.c
diff -ur dvipng-1.14.orig/special.c dvipng-1.14/special.c
--- dvipng-1.14.orig/special.c 2011-02-07 11:47:08.000000000 +0100
-+++ dvipng-1.14/special.c 2012-08-01 16:22:11.000000000 +0200
-@@ -28,11 +28,7 @@
++++ dvipng-1.14/special.c 2012-08-25 21:36:09.000000000 +0200
+@@ -28,11 +28,8 @@
#ifndef WIN32
#include <sys/wait.h>
#else /* WIN32 */
-#include <fcntl.h>
-#include <io.h>
-#include <process.h>
++#undef pipe
#define pipe(p) _pipe(p, 65536, O_BINARY | _O_NOINHERIT)
-#define snprintf _snprintf
#endif /* WIN32 */
diff --git a/Build/source/texk/dvipng/dvipng-1.14/special.c b/Build/source/texk/dvipng/dvipng-1.14/special.c
index c9d453a9288..b8db90ce5ff 100644
--- a/Build/source/texk/dvipng/dvipng-1.14/special.c
+++ b/Build/source/texk/dvipng/dvipng-1.14/special.c
@@ -28,6 +28,7 @@
#ifndef WIN32
#include <sys/wait.h>
#else /* WIN32 */
+#undef pipe
#define pipe(p) _pipe(p, 65536, O_BINARY | _O_NOINHERIT)
#endif /* WIN32 */
#endif