From 6de443780d8947e13e75ab0f4964658bdcffd028 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Mon, 15 Jun 2020 21:40:33 +0000 Subject: support old compilers git-svn-id: svn://tug.org/texlive/trunk@55563 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/detex/ChangeLog | 4 ++++ Build/source/texk/detex/TLpatches/ChangeLog | 8 ++++++++ Build/source/texk/detex/TLpatches/TL-Changes | 2 +- .../texk/detex/TLpatches/patch-01-support-old-compiler | 12 ++++++++++++ Build/source/texk/detex/detex-src/detex.c | 15 ++++++++------- Build/source/texk/detex/detex-src/detex.l | 3 ++- 6 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 Build/source/texk/detex/TLpatches/patch-01-support-old-compiler (limited to 'Build/source') diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog index 833c4e3a0ae..580f7d60fa7 100644 --- a/Build/source/texk/detex/ChangeLog +++ b/Build/source/texk/detex/ChangeLog @@ -1,3 +1,7 @@ +2020-06-16 Akira Kakuto + + * detex.l, detex.c: Support old compilers. + 2020-06-15 Hironobu Yamashita * Import opendetex-2.8.7. diff --git a/Build/source/texk/detex/TLpatches/ChangeLog b/Build/source/texk/detex/TLpatches/ChangeLog index 33e4e868518..23695978a3a 100644 --- a/Build/source/texk/detex/TLpatches/ChangeLog +++ b/Build/source/texk/detex/TLpatches/ChangeLog @@ -1,3 +1,11 @@ +2020-06-16 Akira Kakuto + + Add patch-01-support-old-compiler. + +2020-06-15 Hironobu Yamashita + + Adapt to opendetex-2.8.7. + 2019-02-03 Hironobu Yamashita Adapt to opendetex-2.8.5. diff --git a/Build/source/texk/detex/TLpatches/TL-Changes b/Build/source/texk/detex/TLpatches/TL-Changes index d3d38224b27..05b94f8f9f6 100644 --- a/Build/source/texk/detex/TLpatches/TL-Changes +++ b/Build/source/texk/detex/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the opendetex-2.8.5 tree as obtained from: +Changes applied to the opendetex-2.8.7 tree as obtained from: https://github.com/pkubowicz/opendetex/releases Renamed: diff --git a/Build/source/texk/detex/TLpatches/patch-01-support-old-compiler b/Build/source/texk/detex/TLpatches/patch-01-support-old-compiler new file mode 100644 index 00000000000..d1cd8dce61e --- /dev/null +++ b/Build/source/texk/detex/TLpatches/patch-01-support-old-compiler @@ -0,0 +1,12 @@ +--- detex.l.orig Mon Jun 15 20:23:15 2020 ++++ detex.l Tue Jun 16 06:09:30 2020 +@@ -732,7 +732,8 @@ + void + IncrLineNo() + { +- for (char* c=yytext; *c != '\0'; c++) { ++ char *c; ++ for (c=yytext; *c != '\0'; c++) { + if (*c == '\n') { + fFileLines[csb]++; fIsColumn0=1; + } diff --git a/Build/source/texk/detex/detex-src/detex.c b/Build/source/texk/detex/detex-src/detex.c index 61e35f07411..42e8f220f75 100644 --- a/Build/source/texk/detex/detex-src/detex.c +++ b/Build/source/texk/detex/detex-src/detex.c @@ -87,7 +87,7 @@ #endif /* KPATHSEA */ -#line 91 "lex.yy.c" +#line 90 "lex.yy.c" #define YY_INT_ALIGNED short int @@ -1834,9 +1834,9 @@ int fIsColumn0 = 1; /* Are we at the begining of a line? */ int csb = 0; /* depth of flex context stack */ #endif /* FLEX_SCANNER */ -#line 1838 "lex.yy.c" +#line 1837 "lex.yy.c" -#line 1840 "lex.yy.c" +#line 1839 "lex.yy.c" #define INITIAL 0 #define Define 1 @@ -1868,7 +1868,7 @@ int csb = 0; /* depth of flex context stack */ */ #include #endif - + #ifndef YY_EXTRA_TYPE #define YY_EXTRA_TYPE void * #endif @@ -2074,7 +2074,7 @@ YY_DECL { #line 208 "detex.l" -#line 2078 "lex.yy.c" +#line 2077 "lex.yy.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -3114,7 +3114,7 @@ YY_RULE_SETUP #line 505 "detex.l" ECHO; YY_BREAK -#line 3118 "lex.yy.c" +#line 3117 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(Define): case YY_STATE_EOF(Display): @@ -4335,7 +4335,8 @@ Echo() void IncrLineNo() { - for (char* c=yytext; *c != '\0'; c++) { + char *c; + for (c=yytext; *c != '\0'; c++) { if (*c == '\n') { fFileLines[csb]++; fIsColumn0=1; } diff --git a/Build/source/texk/detex/detex-src/detex.l b/Build/source/texk/detex/detex-src/detex.l index 8273afe7a5b..02f6db80546 100644 --- a/Build/source/texk/detex/detex-src/detex.l +++ b/Build/source/texk/detex/detex-src/detex.l @@ -732,7 +732,8 @@ Echo() void IncrLineNo() { - for (char* c=yytext; *c != '\0'; c++) { + char *c; + for (c=yytext; *c != '\0'; c++) { if (*c == '\n') { fFileLines[csb]++; fIsColumn0=1; } -- cgit v1.2.3