From 0af0f41700900cdfd791389cb63c3b57ce4d957f Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 27 Apr 2022 14:43:04 +0000 Subject: [WEB] Avoid non-POSIX conflict with Solaris 11.4. See https://tug.org/pipermail/tlbuild/2022q2/005220.html for the bug report and https://blogs.oracle.com/solaris/post/reflink3c-what-is-it-why-do-i-care-and-how-can-i-use-it for Oracle's rationale. git-svn-id: svn://tug.org/texlive/trunk@63158 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 ++++ Build/source/texk/web2c/weav-twill.ch | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 952b7b631f8..1fd5e66acdc 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2022-04-27 Andreas Scherer + + * weav-twill.ch: Avoid non-POSIX conflict with Solaris 11.4. + 2022-04-06 Andreas Scherer * weav-twill.ch: My name is 'twill'. diff --git a/Build/source/texk/web2c/weav-twill.ch b/Build/source/texk/web2c/weav-twill.ch index f61a3bb7254..f944d1cfe31 100644 --- a/Build/source/texk/web2c/weav-twill.ch +++ b/Build/source/texk/web2c/weav-twill.ch @@ -568,7 +568,7 @@ Section 220. begin incr(module_count);@/ @y begin incr(module_count);@/ -mm:=module_count+def_flag; ref_link[0]:=0; ref_loc[0]:=0; new_ref_ptr:=0; +mm:=module_count+def_flag; ref_lnk[0]:=0; ref_loc[0]:=0; new_ref_ptr:=0; safety:=guaranteed; @z @@ -831,9 +831,9 @@ if q<>0 then if q<>undef_val then if not phase_three then begin repeat r:=q; q:=dlink(q); until (q=0) or (num(q)>mm); if num(r)<>mm then - begin qq:=0; q:=ref_link[0]; + begin qq:=0; q:=ref_lnk[0]; while ref_loc[q]>r do - begin qq:=q; q:=ref_link[qq]; + begin qq:=q; q:=ref_lnk[qq]; end; if ref_loc[q]=r then begin if safety=guaranteed then @@ -841,7 +841,7 @@ if q<>0 then if q<>undef_val then if not phase_three then end else begin if new_ref_ptr=max_new_refs then overflow('new references'); incr(new_ref_ptr); - ref_link[new_ref_ptr]:=q; ref_link[qq]:=new_ref_ptr; + ref_lnk[new_ref_ptr]:=q; ref_lnk[qq]:=new_ref_ptr; ref_loc[new_ref_ptr]:=r; if dlink(def_val[p])=0 then ref_safety[new_ref_ptr]:=guaranteed else ref_safety[new_ref_ptr]:=safety; @@ -870,7 +870,7 @@ identifier is multiply defined. @= @!mm:integer; {current module number plus |def_flag|} @!ref_loc:array[0..max_new_refs] of sixteen_bits; -@!ref_link:array[0..max_new_refs] of sixteen_bits; +@!ref_lnk:array[0..max_new_refs] of sixteen_bits; @!ref_safety:array[0..max_new_refs] of guaranteed..flaky; @!new_ref_ptr:0..max_new_refs; @!safety:guaranteed..flaky; @@ -938,7 +938,7 @@ but not defined in the current module. procedure beta_out; label done,888,found; var k,p,q,w,xx,mmm:integer; -begin p:=ref_link[0]; +begin p:=ref_lnk[0]; while p<>0 do begin flush_buffer(out_ptr,false,false); out2("\")("["); @@ -949,7 +949,7 @@ while p<>0 do @; @; if ref_safety[p]=flaky then out3(" ")("%")("?"); - p:=ref_link[p]; + p:=ref_lnk[p]; end; end; -- cgit v1.2.3