diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-08-01 14:35:02 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-08-01 14:35:02 +0000 |
| commit | 5d09ff3717e5968fe78a3dc93df3864315ff4b52 (patch) | |
| tree | 35321e051620eab8d0db6939ccb99a9c80072f6c | |
| parent | cb9434bf5db409773dd66372c52f344b8dc21d76 (diff) | |
dvipng: Adapt to snprintf handled by kpathsea
git-svn-id: svn://tug.org/texlive/trunk@27272 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32 | 15 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/dvipng-1.14/special.c | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog index 10c373636db..6c49a50b0e4 100644 --- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog +++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2012-08-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-06-WIN32: Do not redefine snprintf, handled by kpathsea. + Also, kpathsea has included <fcntl.h>, <io.h>, and <process.h>. + 2011-08-03 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-06-WIN32 (new): Call texlive_gs_init() for MINGW32, 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 d9c5b9410e3..f721629d983 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 @@ -12,3 +12,18 @@ diff -ur dvipng-1.14.orig/dvipng.c dvipng-1.14/dvipng.c initcolor(); parsestdin = DecodeArgs(argc, argv); +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 @@ + #ifndef WIN32 + #include <sys/wait.h> + #else /* WIN32 */ +-#include <fcntl.h> +-#include <io.h> +-#include <process.h> + #define pipe(p) _pipe(p, 65536, O_BINARY | _O_NOINHERIT) +-#define snprintf _snprintf + #endif /* WIN32 */ + #endif + diff --git a/Build/source/texk/dvipng/dvipng-1.14/special.c b/Build/source/texk/dvipng/dvipng-1.14/special.c index 6642e6266d2..c9d453a9288 100644 --- a/Build/source/texk/dvipng/dvipng-1.14/special.c +++ b/Build/source/texk/dvipng/dvipng-1.14/special.c @@ -28,11 +28,7 @@ #ifndef WIN32 #include <sys/wait.h> #else /* WIN32 */ -#include <fcntl.h> -#include <io.h> -#include <process.h> #define pipe(p) _pipe(p, 65536, O_BINARY | _O_NOINHERIT) -#define snprintf _snprintf #endif /* WIN32 */ #endif |