From ec9ca906a994c385dd682a5b5ebdf31f8b787ad6 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 22 Nov 2013 08:45:19 +0000 Subject: xindy: Adapt for MinGW git-svn-id: svn://tug.org/texlive/trunk@32209 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog | 4 ++++ Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32 | 8 ++++---- Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32 | 10 +++++----- Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c | 6 +++--- Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l | 6 +++--- 5 files changed, 19 insertions(+), 15 deletions(-) (limited to 'Build/source/utils/xindy') diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog index 98de56b2bba..1131380c590 100644 --- a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog +++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2013-11-22 Peter Breitenlohner + + * patch-0[34]-win32: Adapt Win32 changes to MinGW. + 2013-10-23 Peter Breitenlohner * patch-70-persian: Use Makefile fragment. diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32 b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32 index 68e27d8ed65..4345e75cb87 100644 --- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32 +++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32 @@ -1,6 +1,6 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/tex2xindy/tex2xindy.l xindy-2.4/tex2xindy/tex2xindy.l --- xindy-2.4.orig/tex2xindy/tex2xindy.l 2012-06-21 12:13:02.000000000 +0200 -+++ xindy-2.4/tex2xindy/tex2xindy.l 2012-09-27 14:37:06.000000000 +0200 ++++ xindy-2.4/tex2xindy/tex2xindy.l 2013-11-22 09:25:00.000000000 +0100 @@ -89,11 +89,24 @@ =cut @@ -12,10 +12,10 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/tex2xindy/tex2xindy. #include -#include +#ifdef WIN32 -+# include +# include -+# define YY_NO_UNISTD_H 1 -+# ifdef W32TeX ++# ifndef __MINGW32__ /* this should be W32TeX */ ++# include ++# define YY_NO_UNISTD_H 1 +# define __STDC_VERSION__ 199901L +# endif +#else diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32 b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32 index 198053967e6..811dca47786 100644 --- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32 +++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32 @@ -1,15 +1,15 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/tex2xindy/tex2xindy.c xindy-2.4/tex2xindy/tex2xindy.c ---- xindy-2.4.orig/tex2xindy/tex2xindy.c 2012-06-21 12:14:36.000000000 +0200 -+++ xindy-2.4/tex2xindy/tex2xindy.c 2012-09-27 14:37:38.000000000 +0200 +--- xindy-2.4.orig/tex2xindy/tex2xindy.c 2013-11-22 09:30:35.299204605 +0100 ++++ xindy-2.4/tex2xindy/tex2xindy.c 2013-11-22 09:27:49.000000000 +0100 @@ -1,5 +1,20 @@ +#line 95 "tex2xindy.l" +#include +#include +#ifdef WIN32 -+# include +# include -+# define YY_NO_UNISTD_H 1 -+# ifdef W32TeX ++# ifndef __MINGW32__ /* this should be W32TeX */ ++# include ++# define YY_NO_UNISTD_H 1 +# define __STDC_VERSION__ 199901L +# endif +#else diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c index 232a58f2672..d2d573336e2 100644 --- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c +++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c @@ -2,10 +2,10 @@ #include #include #ifdef WIN32 -# include # include -# define YY_NO_UNISTD_H 1 -# ifdef W32TeX +# ifndef __MINGW32__ /* this should be W32TeX */ +# include +# define YY_NO_UNISTD_H 1 # define __STDC_VERSION__ 199901L # endif #else diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l index dd3ef7ee7e6..edb6ea41be3 100644 --- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l +++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l @@ -95,10 +95,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #include #ifdef WIN32 -# include # include -# define YY_NO_UNISTD_H 1 -# ifdef W32TeX +# ifndef __MINGW32__ /* this should be W32TeX */ +# include +# define YY_NO_UNISTD_H 1 # define __STDC_VERSION__ 199901L # endif #else -- cgit v1.2.3