git: fb3ef04d2028 - main - Add 'contrib/unifdef/' from commit '0da44885831dc0a43c4ca6ff04a2430993cc0a80'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Aug 2023 17:53:19 UTC
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=fb3ef04d2028110f06d68b09009f1f2ca0f4128e
commit fb3ef04d2028110f06d68b09009f1f2ca0f4128e
Merge: 3b7ffacdee49 0da44885831d
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-08-21 17:51:03 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-08-21 17:51:03 +0000
Add 'contrib/unifdef/' from commit '0da44885831dc0a43c4ca6ff04a2430993cc0a80'
git-subtree-dir: contrib/unifdef
git-subtree-mainline: 3b7ffacdee49f90716cba2bcf8af3fc1971ae031
git-subtree-split: 0da44885831dc0a43c4ca6ff04a2430993cc0a80
contrib/unifdef/.gitignore | 7 +
contrib/unifdef/.travis.yml | 59 +
contrib/unifdef/COPYING | 85 ++
contrib/unifdef/FreeBSD/err.c | 138 ++
contrib/unifdef/FreeBSD/getopt.c | 118 ++
contrib/unifdef/INSTALL | 36 +
contrib/unifdef/Makefile | 58 +
contrib/unifdef/README | 53 +
contrib/unifdef/ifdef-how.pl | 42 +
contrib/unifdef/scripts/authors.svn | 15 +
contrib/unifdef/scripts/copycheck.sh | 21 +
contrib/unifdef/scripts/fixtests.sh | 9 +
contrib/unifdef/scripts/git.config | 10 +
contrib/unifdef/scripts/gitlog2changelog.sh | 9 +
contrib/unifdef/scripts/release.sh | 18 +
contrib/unifdef/scripts/reversion.sh | 41 +
contrib/unifdef/scripts/runtests.sh | 38 +
contrib/unifdef/scripts/svnup.sh | 12 +
contrib/unifdef/scripts/upload.sh | 19 +
contrib/unifdef/tests/000-init.experr | 0
contrib/unifdef/tests/000-init.expout | 0
contrib/unifdef/tests/000-init.exprc | 1 +
contrib/unifdef/tests/000-init.sh | 1 +
contrib/unifdef/tests/NetBSD-42628.c | 25 +
contrib/unifdef/tests/NetBSD-42628.experr | 0
contrib/unifdef/tests/NetBSD-42628.expout | 6 +
contrib/unifdef/tests/NetBSD-42628.exprc | 1 +
contrib/unifdef/tests/NetBSD-42628.sh | 1 +
contrib/unifdef/tests/NetBSD-47068.c | 2 +
contrib/unifdef/tests/NetBSD-47068.experr | 0
contrib/unifdef/tests/NetBSD-47068.expout | 2 +
contrib/unifdef/tests/NetBSD-47068.exprc | 1 +
contrib/unifdef/tests/NetBSD-47068.sh | 1 +
contrib/unifdef/tests/args1.c | 3 +
contrib/unifdef/tests/args1.experr | 0
contrib/unifdef/tests/args1.expout | 1 +
contrib/unifdef/tests/args1.exprc | 1 +
contrib/unifdef/tests/args1.sh | 1 +
contrib/unifdef/tests/args2.c | 3 +
contrib/unifdef/tests/args2.experr | 0
contrib/unifdef/tests/args2.expout | 3 +
contrib/unifdef/tests/args2.exprc | 1 +
contrib/unifdef/tests/args2.sh | 1 +
contrib/unifdef/tests/blank0d.c | 25 +
contrib/unifdef/tests/blank0d.experr | 0
contrib/unifdef/tests/blank0d.expout | 23 +
contrib/unifdef/tests/blank0d.exprc | 1 +
contrib/unifdef/tests/blank0d.sh | 1 +
contrib/unifdef/tests/blank0u.c | 25 +
contrib/unifdef/tests/blank0u.experr | 0
contrib/unifdef/tests/blank0u.expout | 22 +
contrib/unifdef/tests/blank0u.exprc | 1 +
contrib/unifdef/tests/blank0u.sh | 1 +
contrib/unifdef/tests/blank1d.c | 25 +
contrib/unifdef/tests/blank1d.experr | 0
contrib/unifdef/tests/blank1d.expout | 23 +
contrib/unifdef/tests/blank1d.exprc | 1 +
contrib/unifdef/tests/blank1d.sh | 1 +
contrib/unifdef/tests/blank1u.c | 25 +
contrib/unifdef/tests/blank1u.experr | 0
contrib/unifdef/tests/blank1u.expout | 21 +
contrib/unifdef/tests/blank1u.exprc | 1 +
contrib/unifdef/tests/blank1u.sh | 1 +
contrib/unifdef/tests/blank2d.c | 25 +
contrib/unifdef/tests/blank2d.experr | 0
contrib/unifdef/tests/blank2d.expout | 23 +
contrib/unifdef/tests/blank2d.exprc | 1 +
contrib/unifdef/tests/blank2d.sh | 1 +
contrib/unifdef/tests/blank2u.c | 25 +
contrib/unifdef/tests/blank2u.experr | 0
contrib/unifdef/tests/blank2u.expout | 20 +
contrib/unifdef/tests/blank2u.exprc | 1 +
contrib/unifdef/tests/blank2u.sh | 1 +
contrib/unifdef/tests/blank3d.c | 25 +
contrib/unifdef/tests/blank3d.experr | 0
contrib/unifdef/tests/blank3d.expout | 23 +
contrib/unifdef/tests/blank3d.exprc | 1 +
contrib/unifdef/tests/blank3d.sh | 1 +
contrib/unifdef/tests/blank3u.c | 25 +
contrib/unifdef/tests/blank3u.experr | 0
contrib/unifdef/tests/blank3u.expout | 19 +
contrib/unifdef/tests/blank3u.exprc | 1 +
contrib/unifdef/tests/blank3u.sh | 1 +
contrib/unifdef/tests/blank4d.c | 25 +
contrib/unifdef/tests/blank4d.experr | 0
contrib/unifdef/tests/blank4d.expout | 23 +
contrib/unifdef/tests/blank4d.exprc | 1 +
contrib/unifdef/tests/blank4d.sh | 1 +
contrib/unifdef/tests/blank4u.c | 25 +
contrib/unifdef/tests/blank4u.experr | 0
contrib/unifdef/tests/blank4u.expout | 18 +
contrib/unifdef/tests/blank4u.exprc | 1 +
contrib/unifdef/tests/blank4u.sh | 1 +
contrib/unifdef/tests/broken2.h | 1 +
contrib/unifdef/tests/broken3.h | 1 +
contrib/unifdef/tests/broken4.h | 2 +
contrib/unifdef/tests/crlf-a.experr | 0
contrib/unifdef/tests/crlf-a.expout | 10 +
contrib/unifdef/tests/crlf-a.exprc | 1 +
contrib/unifdef/tests/crlf-a.sh | 1 +
contrib/unifdef/tests/crlf-b.experr | 0
contrib/unifdef/tests/crlf-b.expout | 14 +
contrib/unifdef/tests/crlf-b.exprc | 1 +
contrib/unifdef/tests/crlf-b.sh | 1 +
contrib/unifdef/tests/crlf-c.experr | 0
contrib/unifdef/tests/crlf-c.expout | 16 +
contrib/unifdef/tests/crlf-c.exprc | 1 +
contrib/unifdef/tests/crlf-c.sh | 1 +
contrib/unifdef/tests/crlf-d.experr | 0
contrib/unifdef/tests/crlf-d.expout | 18 +
contrib/unifdef/tests/crlf-d.exprc | 1 +
contrib/unifdef/tests/crlf-d.sh | 1 +
contrib/unifdef/tests/crlf.c | 20 +
contrib/unifdef/tests/dangle.c | 6 +
contrib/unifdef/tests/dangle.experr | 0
contrib/unifdef/tests/dangle.expout | 6 +
contrib/unifdef/tests/dangle.exprc | 1 +
contrib/unifdef/tests/dangle.sh | 1 +
contrib/unifdef/tests/debian-603860.c | 8 +
contrib/unifdef/tests/debian-603860.experr | 0
contrib/unifdef/tests/debian-603860.expout | 2 +
contrib/unifdef/tests/debian-603860.exprc | 1 +
contrib/unifdef/tests/debian-603860.sh | 1 +
contrib/unifdef/tests/defundef-broken2.experr | 2 +
contrib/unifdef/tests/defundef-broken2.expout | 0
contrib/unifdef/tests/defundef-broken2.exprc | 1 +
contrib/unifdef/tests/defundef-broken2.sh | 1 +
contrib/unifdef/tests/defundef-broken3.experr | 2 +
contrib/unifdef/tests/defundef-broken3.expout | 0
contrib/unifdef/tests/defundef-broken3.exprc | 1 +
contrib/unifdef/tests/defundef-broken3.sh | 1 +
contrib/unifdef/tests/defundef-broken4.experr | 2 +
contrib/unifdef/tests/defundef-broken4.expout | 0
contrib/unifdef/tests/defundef-broken4.exprc | 1 +
contrib/unifdef/tests/defundef-broken4.sh | 1 +
contrib/unifdef/tests/defundef-funlike.experr | 0
contrib/unifdef/tests/defundef-funlike.expout | 13 +
contrib/unifdef/tests/defundef-funlike.exprc | 1 +
contrib/unifdef/tests/defundef-funlike.sh | 1 +
contrib/unifdef/tests/defundef-undefdef.experr | 0
contrib/unifdef/tests/defundef-undefdef.expout | 1 +
contrib/unifdef/tests/defundef-undefdef.exprc | 1 +
contrib/unifdef/tests/defundef-undefdef.sh | 1 +
contrib/unifdef/tests/div.c | 3 +
contrib/unifdef/tests/div.experr | 0
contrib/unifdef/tests/div.expout | 10 +
contrib/unifdef/tests/div.exprc | 1 +
contrib/unifdef/tests/div.sh | 10 +
contrib/unifdef/tests/empty.c | 0
contrib/unifdef/tests/empty.experr | 0
contrib/unifdef/tests/empty.expout | 0
contrib/unifdef/tests/empty.exprc | 1 +
contrib/unifdef/tests/empty.sh | 1 +
contrib/unifdef/tests/error.c | 4 +
contrib/unifdef/tests/error.experr | 0
contrib/unifdef/tests/error.expout | 2 +
contrib/unifdef/tests/error.exprc | 1 +
contrib/unifdef/tests/error.sh | 1 +
contrib/unifdef/tests/exitmode0a.experr | 0
contrib/unifdef/tests/exitmode0a.expout | 16 +
contrib/unifdef/tests/exitmode0a.exprc | 1 +
contrib/unifdef/tests/exitmode0a.sh | 1 +
contrib/unifdef/tests/exitmode0b.experr | 0
contrib/unifdef/tests/exitmode0b.expout | 26 +
contrib/unifdef/tests/exitmode0b.exprc | 1 +
contrib/unifdef/tests/exitmode0b.sh | 1 +
contrib/unifdef/tests/exitmode1a.experr | 0
contrib/unifdef/tests/exitmode1a.expout | 16 +
contrib/unifdef/tests/exitmode1a.exprc | 1 +
contrib/unifdef/tests/exitmode1a.sh | 1 +
contrib/unifdef/tests/exitmode1b.experr | 0
contrib/unifdef/tests/exitmode1b.expout | 26 +
contrib/unifdef/tests/exitmode1b.exprc | 1 +
contrib/unifdef/tests/exitmode1b.sh | 1 +
contrib/unifdef/tests/exitmode2a.experr | 0
contrib/unifdef/tests/exitmode2a.expout | 16 +
contrib/unifdef/tests/exitmode2a.exprc | 1 +
contrib/unifdef/tests/exitmode2a.sh | 1 +
contrib/unifdef/tests/exitmode2b.experr | 0
contrib/unifdef/tests/exitmode2b.expout | 26 +
contrib/unifdef/tests/exitmode2b.exprc | 1 +
contrib/unifdef/tests/exitmode2b.sh | 1 +
contrib/unifdef/tests/exitstat.c | 3 +
contrib/unifdef/tests/exitstat.experr | 0
contrib/unifdef/tests/exitstat.expout | 3 +
contrib/unifdef/tests/exitstat.exprc | 1 +
contrib/unifdef/tests/exitstat.sh | 1 +
contrib/unifdef/tests/funlike.h | 1 +
contrib/unifdef/tests/if1-a.experr | 0
contrib/unifdef/tests/if1-a.expout | 16 +
contrib/unifdef/tests/if1-a.exprc | 1 +
contrib/unifdef/tests/if1-a.sh | 1 +
contrib/unifdef/tests/if1-f.experr | 0
contrib/unifdef/tests/if1-f.expout | 16 +
contrib/unifdef/tests/if1-f.exprc | 1 +
contrib/unifdef/tests/if1-f.sh | 1 +
contrib/unifdef/tests/if1-k.c | 38 +
contrib/unifdef/tests/if1-k.experr | 0
contrib/unifdef/tests/if1-k.expout | 30 +
contrib/unifdef/tests/if1-k.exprc | 1 +
contrib/unifdef/tests/if1-k.sh | 1 +
contrib/unifdef/tests/if1-kDU.c | 38 +
contrib/unifdef/tests/if1-kDU.experr | 0
contrib/unifdef/tests/if1-kDU.expout | 20 +
contrib/unifdef/tests/if1-kDU.exprc | 1 +
contrib/unifdef/tests/if1-kDU.sh | 1 +
contrib/unifdef/tests/if1.c | 26 +
contrib/unifdef/tests/if1.experr | 0
contrib/unifdef/tests/if1.expout | 16 +
contrib/unifdef/tests/if1.exprc | 1 +
contrib/unifdef/tests/if1.h | 3 +
contrib/unifdef/tests/if1.sh | 1 +
contrib/unifdef/tests/if1a.experr | 0
contrib/unifdef/tests/if1a.expout | 24 +
contrib/unifdef/tests/if1a.exprc | 1 +
contrib/unifdef/tests/if1a.sh | 1 +
contrib/unifdef/tests/if2-a.experr | 0
contrib/unifdef/tests/if2-a.expout | 13 +
contrib/unifdef/tests/if2-a.exprc | 1 +
contrib/unifdef/tests/if2-a.sh | 1 +
contrib/unifdef/tests/if2-k.c | 29 +
contrib/unifdef/tests/if2-k.experr | 0
contrib/unifdef/tests/if2-k.expout | 21 +
contrib/unifdef/tests/if2-k.exprc | 1 +
contrib/unifdef/tests/if2-k.sh | 1 +
contrib/unifdef/tests/if2-kDU.c | 29 +
contrib/unifdef/tests/if2-kDU.experr | 0
contrib/unifdef/tests/if2-kDU.expout | 17 +
contrib/unifdef/tests/if2-kDU.exprc | 1 +
contrib/unifdef/tests/if2-kDU.sh | 1 +
contrib/unifdef/tests/if2.c | 17 +
contrib/unifdef/tests/if2.experr | 0
contrib/unifdef/tests/if2.expout | 13 +
contrib/unifdef/tests/if2.exprc | 1 +
contrib/unifdef/tests/if2.sh | 1 +
contrib/unifdef/tests/if3-a.experr | 0
contrib/unifdef/tests/if3-a.expout | 13 +
contrib/unifdef/tests/if3-a.exprc | 1 +
contrib/unifdef/tests/if3-a.sh | 1 +
contrib/unifdef/tests/if3-k.c | 29 +
contrib/unifdef/tests/if3-k.experr | 0
contrib/unifdef/tests/if3-k.expout | 21 +
contrib/unifdef/tests/if3-k.exprc | 1 +
contrib/unifdef/tests/if3-k.sh | 1 +
contrib/unifdef/tests/if3-kDU.c | 29 +
contrib/unifdef/tests/if3-kDU.experr | 0
contrib/unifdef/tests/if3-kDU.expout | 17 +
contrib/unifdef/tests/if3-kDU.exprc | 1 +
contrib/unifdef/tests/if3-kDU.sh | 1 +
contrib/unifdef/tests/if3.c | 17 +
contrib/unifdef/tests/if3.experr | 0
contrib/unifdef/tests/if3.expout | 13 +
contrib/unifdef/tests/if3.exprc | 1 +
contrib/unifdef/tests/if3.sh | 1 +
contrib/unifdef/tests/if4-a.experr | 0
contrib/unifdef/tests/if4-a.expout | 22 +
contrib/unifdef/tests/if4-a.exprc | 1 +
contrib/unifdef/tests/if4-a.sh | 1 +
contrib/unifdef/tests/if4-k.c | 50 +
contrib/unifdef/tests/if4-k.experr | 0
contrib/unifdef/tests/if4-k.expout | 42 +
contrib/unifdef/tests/if4-k.exprc | 1 +
contrib/unifdef/tests/if4-k.sh | 1 +
contrib/unifdef/tests/if4-kDU.c | 50 +
contrib/unifdef/tests/if4-kDU.experr | 0
contrib/unifdef/tests/if4-kDU.expout | 26 +
contrib/unifdef/tests/if4-kDU.exprc | 1 +
contrib/unifdef/tests/if4-kDU.sh | 1 +
contrib/unifdef/tests/if4.c | 38 +
contrib/unifdef/tests/if4.experr | 0
contrib/unifdef/tests/if4.expout | 22 +
contrib/unifdef/tests/if4.exprc | 1 +
contrib/unifdef/tests/if4.sh | 1 +
contrib/unifdef/tests/if5-a.experr | 0
contrib/unifdef/tests/if5-a.expout | 40 +
contrib/unifdef/tests/if5-a.exprc | 1 +
contrib/unifdef/tests/if5-a.sh | 1 +
contrib/unifdef/tests/if5-k.c | 64 +
contrib/unifdef/tests/if5-k.experr | 0
contrib/unifdef/tests/if5-k.expout | 56 +
contrib/unifdef/tests/if5-k.exprc | 1 +
contrib/unifdef/tests/if5-k.sh | 1 +
contrib/unifdef/tests/if5-kDU.c | 64 +
contrib/unifdef/tests/if5-kDU.experr | 0
contrib/unifdef/tests/if5-kDU.expout | 32 +
contrib/unifdef/tests/if5-kDU.exprc | 1 +
contrib/unifdef/tests/if5-kDU.sh | 1 +
contrib/unifdef/tests/if5.c | 80 ++
contrib/unifdef/tests/if5.experr | 0
contrib/unifdef/tests/if5.expout | 40 +
contrib/unifdef/tests/if5.exprc | 1 +
contrib/unifdef/tests/if5.sh | 1 +
contrib/unifdef/tests/if6.c | 11 +
contrib/unifdef/tests/if6.h | 2 +
contrib/unifdef/tests/if6a.experr | 0
contrib/unifdef/tests/if6a.expout | 1 +
contrib/unifdef/tests/if6a.exprc | 1 +
contrib/unifdef/tests/if6a.sh | 1 +
contrib/unifdef/tests/if6b.experr | 0
contrib/unifdef/tests/if6b.expout | 5 +
contrib/unifdef/tests/if6b.exprc | 1 +
contrib/unifdef/tests/if6b.sh | 1 +
contrib/unifdef/tests/if6c.experr | 0
contrib/unifdef/tests/if6c.expout | 7 +
contrib/unifdef/tests/if6c.exprc | 1 +
contrib/unifdef/tests/if6c.sh | 1 +
contrib/unifdef/tests/if6d.experr | 0
contrib/unifdef/tests/if6d.expout | 9 +
contrib/unifdef/tests/if6d.exprc | 1 +
contrib/unifdef/tests/if6d.sh | 1 +
contrib/unifdef/tests/if7.c | 94 ++
contrib/unifdef/tests/if7.experr | 0
contrib/unifdef/tests/if7.expout | 46 +
contrib/unifdef/tests/if7.exprc | 1 +
contrib/unifdef/tests/if7.sh | 1 +
contrib/unifdef/tests/indirect.experr | 0
contrib/unifdef/tests/indirect.expout | 16 +
contrib/unifdef/tests/indirect.exprc | 1 +
contrib/unifdef/tests/indirect.sh | 1 +
contrib/unifdef/tests/multi-generic-sh | 15 +
contrib/unifdef/tests/multi.experr | 0
contrib/unifdef/tests/multi.expout | 36 +
contrib/unifdef/tests/multi.exprc | 1 +
contrib/unifdef/tests/multi.sh | 3 +
contrib/unifdef/tests/multilnnum.experr | 0
contrib/unifdef/tests/multilnnum.expout | 42 +
contrib/unifdef/tests/multilnnum.exprc | 1 +
contrib/unifdef/tests/multilnnum.sh | 3 +
contrib/unifdef/tests/multimissing.experr | 4 +
contrib/unifdef/tests/multimissing.expout | 22 +
contrib/unifdef/tests/multimissing.exprc | 1 +
contrib/unifdef/tests/multimissing.sh | 3 +
contrib/unifdef/tests/multinewline.experr | 0
contrib/unifdef/tests/multinewline.expout | 39 +
contrib/unifdef/tests/multinewline.exprc | 1 +
contrib/unifdef/tests/multinewline.sh | 3 +
contrib/unifdef/tests/none.c | 5 +
contrib/unifdef/tests/none.experr | 0
contrib/unifdef/tests/none.expout | 5 +
contrib/unifdef/tests/none.exprc | 1 +
contrib/unifdef/tests/none.sh | 1 +
contrib/unifdef/tests/outdir.experr | 0
contrib/unifdef/tests/outdir.expout | 16 +
contrib/unifdef/tests/outdir.exprc | 1 +
contrib/unifdef/tests/outdir.sh | 6 +
contrib/unifdef/tests/outeperm.experr | 1 +
contrib/unifdef/tests/outeperm.expout | 0
contrib/unifdef/tests/outeperm.exprc | 1 +
contrib/unifdef/tests/outeperm.sh | 6 +
contrib/unifdef/tests/outfile.experr | 0
contrib/unifdef/tests/outfile.expout | 16 +
contrib/unifdef/tests/outfile.exprc | 1 +
contrib/unifdef/tests/outfile.sh | 5 +
contrib/unifdef/tests/outperms.experr | 1 +
contrib/unifdef/tests/outperms.expout | 16 +
contrib/unifdef/tests/outperms.exprc | 1 +
contrib/unifdef/tests/outperms.sh | 10 +
contrib/unifdef/tests/overdir.experr | 0
contrib/unifdef/tests/overdir.expout | 16 +
contrib/unifdef/tests/overdir.exprc | 1 +
contrib/unifdef/tests/overdir.sh | 7 +
contrib/unifdef/tests/overenoent.experr | 1 +
contrib/unifdef/tests/overenoent.expout | 0
contrib/unifdef/tests/overenoent.exprc | 1 +
contrib/unifdef/tests/overenoent.sh | 5 +
contrib/unifdef/tests/overin.experr | 0
contrib/unifdef/tests/overin.expout | 16 +
contrib/unifdef/tests/overin.exprc | 1 +
contrib/unifdef/tests/overin.sh | 6 +
contrib/unifdef/tests/overlnnum.experr | 0
contrib/unifdef/tests/overlnnum.expout | 20 +
contrib/unifdef/tests/overlnnum.exprc | 1 +
contrib/unifdef/tests/overlnnum.sh | 6 +
contrib/unifdef/tests/overperms.experr | 2 +
contrib/unifdef/tests/overperms.expout | 16 +
contrib/unifdef/tests/overperms.exprc | 1 +
contrib/unifdef/tests/overperms.sh | 12 +
contrib/unifdef/tests/overunchanged.experr | 0
contrib/unifdef/tests/overunchanged.expout | 0
contrib/unifdef/tests/overunchanged.exprc | 1 +
contrib/unifdef/tests/overunchanged.sh | 8 +
contrib/unifdef/tests/overwrite.experr | 0
contrib/unifdef/tests/overwrite.expout | 16 +
contrib/unifdef/tests/overwrite.exprc | 1 +
contrib/unifdef/tests/overwrite.sh | 6 +
contrib/unifdef/tests/recursive.experr | 120 ++
contrib/unifdef/tests/recursive.expout | 26 +
contrib/unifdef/tests/recursive.exprc | 1 +
contrib/unifdef/tests/recursive.sh | 1 +
contrib/unifdef/tests/small1.c | 17 +
contrib/unifdef/tests/small1.experr | 0
contrib/unifdef/tests/small1.expout | 13 +
contrib/unifdef/tests/small1.exprc | 1 +
contrib/unifdef/tests/small1.sh | 1 +
contrib/unifdef/tests/small2.c | 17 +
contrib/unifdef/tests/small2.experr | 0
contrib/unifdef/tests/small2.expout | 13 +
contrib/unifdef/tests/small2.exprc | 1 +
contrib/unifdef/tests/small2.sh | 1 +
contrib/unifdef/tests/spaces1.c | 17 +
contrib/unifdef/tests/spaces1.experr | 0
contrib/unifdef/tests/spaces1.expout | 13 +
contrib/unifdef/tests/spaces1.exprc | 1 +
contrib/unifdef/tests/spaces1.sh | 1 +
contrib/unifdef/tests/spaces2.c | 17 +
contrib/unifdef/tests/spaces2.experr | 0
contrib/unifdef/tests/spaces2.expout | 13 +
contrib/unifdef/tests/spaces2.exprc | 1 +
contrib/unifdef/tests/spaces2.sh | 1 +
contrib/unifdef/tests/spaces3.c | 17 +
contrib/unifdef/tests/spaces3.experr | 0
contrib/unifdef/tests/spaces3.expout | 13 +
contrib/unifdef/tests/spaces3.exprc | 1 +
contrib/unifdef/tests/spaces3.sh | 1 +
contrib/unifdef/tests/spaces4.c | 17 +
contrib/unifdef/tests/spaces4.experr | 0
contrib/unifdef/tests/spaces4.expout | 13 +
contrib/unifdef/tests/spaces4.exprc | 1 +
contrib/unifdef/tests/spaces4.sh | 1 +
contrib/unifdef/tests/whitespace-1.experr | 2 +
contrib/unifdef/tests/whitespace-1.expout | 1 +
contrib/unifdef/tests/whitespace-1.exprc | 1 +
contrib/unifdef/tests/whitespace-1.sh | 1 +
contrib/unifdef/tests/whitespace-2.experr | 0
contrib/unifdef/tests/whitespace-2.expout | 5 +
contrib/unifdef/tests/whitespace-2.exprc | 1 +
contrib/unifdef/tests/whitespace-2.sh | 1 +
contrib/unifdef/tests/whitespace.c | 7 +
contrib/unifdef/tests/xterm.experr | 3 +
contrib/unifdef/tests/xterm.expout | 83 ++
contrib/unifdef/tests/xterm.exprc | 1 +
contrib/unifdef/tests/xterm.sh | 35 +
contrib/unifdef/unifdef.1 | 530 ++++++++
contrib/unifdef/unifdef.c | 1675 ++++++++++++++++++++++++
contrib/unifdef/unifdef.h | 50 +
contrib/unifdef/unifdefall.sh | 58 +
contrib/unifdef/version.h | 2 +
contrib/unifdef/win32/Makefile.mingw | 14 +
contrib/unifdef/win32/unifdef.h | 84 ++
contrib/unifdef/win32/unifdef.sln | 20 +
contrib/unifdef/win32/unifdef.vcxproj | 96 ++
contrib/unifdef/win32/win32.c | 91 ++
442 files changed, 6545 insertions(+)
diff --cc contrib/unifdef/.gitignore
index 000000000000,000000000000..55ca2f341b7c
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/.gitignore
@@@ -1,0 -1,0 +1,7 @@@
++Changelog
++unifdef
++unifdef.exe
++unifdef.txt
++unifdef-*
++version.h
++version.sh
diff --cc contrib/unifdef/.travis.yml
index 000000000000,39aa4292de14..39aa4292de14
mode 000000,100644..100644
--- a/contrib/unifdef/.travis.yml
+++ b/contrib/unifdef/.travis.yml
diff --cc contrib/unifdef/COPYING
index 000000000000,ae0ab7eeb717..ae0ab7eeb717
mode 000000,100644..100644
--- a/contrib/unifdef/COPYING
+++ b/contrib/unifdef/COPYING
diff --cc contrib/unifdef/FreeBSD/err.c
index 000000000000,9589fced5b26..9589fced5b26
mode 000000,100644..100644
--- a/contrib/unifdef/FreeBSD/err.c
+++ b/contrib/unifdef/FreeBSD/err.c
diff --cc contrib/unifdef/FreeBSD/getopt.c
index 000000000000,eb9b0c507875..eb9b0c507875
mode 000000,100644..100644
--- a/contrib/unifdef/FreeBSD/getopt.c
+++ b/contrib/unifdef/FreeBSD/getopt.c
diff --cc contrib/unifdef/INSTALL
index 000000000000,03d7488588ab..03d7488588ab
mode 000000,100644..100644
--- a/contrib/unifdef/INSTALL
+++ b/contrib/unifdef/INSTALL
diff --cc contrib/unifdef/Makefile
index 000000000000,000000000000..36c70283c1b7
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/Makefile
@@@ -1,0 -1,0 +1,58 @@@
++# Makefile for unifdef
++
++prefix = ${HOME}
++bindir = ${prefix}/bin
++mandir = ${prefix}/share/man
++man1dir= ${mandir}/man1
++
++bindest= ${DESTDIR}${bindir}
++man1dest= ${DESTDIR}${man1dir}
++
++all: unifdef
++
++unifdef: unifdef.c unifdef.h version.h
++ ${CC} ${CFLAGS} ${LDFLAGS} -o unifdef unifdef.c
++
++version.h: version.sh
++version.sh::
++ scripts/reversion.sh
++
++test: unifdef
++ scripts/runtests.sh tests
++
++install: unifdef unifdefall.sh unifdef.1
++ : commands
++ install -m 755 -d ${bindest}
++ install -m 755 unifdef ${bindest}/
++ install -m 755 unifdefall.sh ${bindest}/unifdefall
++ : manual
++ install -m 755 -d ${man1dest}
++ install -m 644 unifdef.1 ${man1dest}/
++ ln -s unifdef.1 ${man1dest}/unifdefall.1
++
++clean:
++ rm -f unifdef version.h
++ rm -f tests/*.out tests/*.err tests/*.rc
++
++realclean: clean
++ rm -f unifdef.txt
++ [ ! -d .git ] || rm -f Changelog version.sh
++ find . -name .git -prune -o \( \
++ -name '*~' -o -name '.#*' -o \
++ -name '*.orig' -o -name '*.core' -o \
++ -name 'xterm-*' -o -name 'xterm.tar.gz' \
++ \) -delete
++
++DISTEXTRA= version.h version.sh unifdef.txt Changelog
++
++release: ${DISTEXTRA}
++ scripts/copycheck.sh
++ scripts/release.sh ${DISTEXTRA}
++
++unifdef.txt: unifdef.1
++ nroff -Tascii -mdoc unifdef.1 | col -bx >unifdef.txt
++
++Changelog: version.sh scripts/gitlog2changelog.sh
++ scripts/gitlog2changelog.sh >Changelog
++
++# eof
diff --cc contrib/unifdef/README
index 000000000000,cdf52e1e0c62..cdf52e1e0c62
mode 000000,100644..100644
--- a/contrib/unifdef/README
+++ b/contrib/unifdef/README
diff --cc contrib/unifdef/ifdef-how.pl
index 000000000000,f8b487512c2c..f8b487512c2c
mode 000000,100755..100755
--- a/contrib/unifdef/ifdef-how.pl
+++ b/contrib/unifdef/ifdef-how.pl
diff --cc contrib/unifdef/scripts/authors.svn
index 000000000000,7df117e2d355..7df117e2d355
mode 000000,100644..100644
--- a/contrib/unifdef/scripts/authors.svn
+++ b/contrib/unifdef/scripts/authors.svn
diff --cc contrib/unifdef/scripts/copycheck.sh
index 000000000000,c55cd1a22548..c55cd1a22548
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/copycheck.sh
+++ b/contrib/unifdef/scripts/copycheck.sh
diff --cc contrib/unifdef/scripts/fixtests.sh
index 000000000000,a4d6a33b1cf3..a4d6a33b1cf3
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/fixtests.sh
+++ b/contrib/unifdef/scripts/fixtests.sh
diff --cc contrib/unifdef/scripts/git.config
index 000000000000,557c2200ba41..557c2200ba41
mode 000000,100644..100644
--- a/contrib/unifdef/scripts/git.config
+++ b/contrib/unifdef/scripts/git.config
diff --cc contrib/unifdef/scripts/gitlog2changelog.sh
index 000000000000,52130237e72a..52130237e72a
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/gitlog2changelog.sh
+++ b/contrib/unifdef/scripts/gitlog2changelog.sh
diff --cc contrib/unifdef/scripts/release.sh
index 000000000000,bfdd4fc3a1e7..bfdd4fc3a1e7
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/release.sh
+++ b/contrib/unifdef/scripts/release.sh
diff --cc contrib/unifdef/scripts/reversion.sh
index 000000000000,5098d8ad5c6f..5098d8ad5c6f
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/reversion.sh
+++ b/contrib/unifdef/scripts/reversion.sh
diff --cc contrib/unifdef/scripts/runtests.sh
index 000000000000,452f0e9e06e1..452f0e9e06e1
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/runtests.sh
+++ b/contrib/unifdef/scripts/runtests.sh
diff --cc contrib/unifdef/scripts/svnup.sh
index 000000000000,51702df18633..51702df18633
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/svnup.sh
+++ b/contrib/unifdef/scripts/svnup.sh
diff --cc contrib/unifdef/scripts/upload.sh
index 000000000000,b55616d03f02..b55616d03f02
mode 000000,100755..100755
--- a/contrib/unifdef/scripts/upload.sh
+++ b/contrib/unifdef/scripts/upload.sh
diff --cc contrib/unifdef/tests/000-init.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/000-init.experr
diff --cc contrib/unifdef/tests/000-init.expout
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/000-init.expout
diff --cc contrib/unifdef/tests/000-init.exprc
index 000000000000,573541ac9702..573541ac9702
mode 000000,100644..100644
--- a/contrib/unifdef/tests/000-init.exprc
+++ b/contrib/unifdef/tests/000-init.exprc
diff --cc contrib/unifdef/tests/000-init.sh
index 000000000000,174f5c4a84a6..174f5c4a84a6
mode 000000,100644..100644
--- a/contrib/unifdef/tests/000-init.sh
+++ b/contrib/unifdef/tests/000-init.sh
diff --cc contrib/unifdef/tests/NetBSD-42628.c
index 000000000000,000000000000..9de6a94a0773
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/NetBSD-42628.c
@@@ -1,0 -1,0 +1,25 @@@
++#if defined(__FreeBSD__)
++#include <netinet/if_fddi.h>
++#else
++#include <net/if_fddi.h>
++#endif
++
++#if defined(__FreeBSD__)
++ #include <stdbool.h>
++ #include <stdbool.h>
++ #include <stdbool.h>
++ #include <stdbool.h>
++ #include <stdbool.h>
++ #include <stdbool.h>
++#else
++#include <stdint.h>
++#endif
++
++#if defined(__FreeBSD__)
++#endif
++
++#ifdef __FreeBSD__
++#include <unistd.h>
++#else
++#include <inttypes.h>
++#endif
diff --cc contrib/unifdef/tests/NetBSD-42628.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/NetBSD-42628.experr
diff --cc contrib/unifdef/tests/NetBSD-42628.expout
index 000000000000,000000000000..2d52e9e7ae29
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/NetBSD-42628.expout
@@@ -1,0 -1,0 +1,6 @@@
++#include <net/if_fddi.h>
++
++#include <stdint.h>
++
++
++#include <inttypes.h>
diff --cc contrib/unifdef/tests/NetBSD-42628.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/NetBSD-42628.exprc
+++ b/contrib/unifdef/tests/NetBSD-42628.exprc
diff --cc contrib/unifdef/tests/NetBSD-42628.sh
index 000000000000,87ac1aa9c4e8..87ac1aa9c4e8
mode 000000,100644..100644
--- a/contrib/unifdef/tests/NetBSD-42628.sh
+++ b/contrib/unifdef/tests/NetBSD-42628.sh
diff --cc contrib/unifdef/tests/NetBSD-47068.c
index 000000000000,515f50b6eafd..515f50b6eafd
mode 000000,100644..100644
--- a/contrib/unifdef/tests/NetBSD-47068.c
+++ b/contrib/unifdef/tests/NetBSD-47068.c
diff --cc contrib/unifdef/tests/NetBSD-47068.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/NetBSD-47068.experr
diff --cc contrib/unifdef/tests/NetBSD-47068.expout
index 000000000000,1fb9d525074e..1fb9d525074e
mode 000000,100644..100644
--- a/contrib/unifdef/tests/NetBSD-47068.expout
+++ b/contrib/unifdef/tests/NetBSD-47068.expout
diff --cc contrib/unifdef/tests/NetBSD-47068.exprc
index 000000000000,573541ac9702..573541ac9702
mode 000000,100644..100644
--- a/contrib/unifdef/tests/NetBSD-47068.exprc
+++ b/contrib/unifdef/tests/NetBSD-47068.exprc
diff --cc contrib/unifdef/tests/NetBSD-47068.sh
index 000000000000,2ec1bbef00a1..2ec1bbef00a1
mode 000000,100644..100644
--- a/contrib/unifdef/tests/NetBSD-47068.sh
+++ b/contrib/unifdef/tests/NetBSD-47068.sh
diff --cc contrib/unifdef/tests/args1.c
index 000000000000,1cb554688c37..1cb554688c37
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args1.c
+++ b/contrib/unifdef/tests/args1.c
diff --cc contrib/unifdef/tests/args1.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/args1.experr
diff --cc contrib/unifdef/tests/args1.expout
index 000000000000,000000000000..ce013625030b
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/args1.expout
@@@ -1,0 -1,0 +1,1 @@@
++hello
diff --cc contrib/unifdef/tests/args1.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args1.exprc
+++ b/contrib/unifdef/tests/args1.exprc
diff --cc contrib/unifdef/tests/args1.sh
index 000000000000,051baf41118a..051baf41118a
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args1.sh
+++ b/contrib/unifdef/tests/args1.sh
diff --cc contrib/unifdef/tests/args2.c
index 000000000000,8fe476b18ee2..8fe476b18ee2
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args2.c
+++ b/contrib/unifdef/tests/args2.c
diff --cc contrib/unifdef/tests/args2.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/args2.experr
diff --cc contrib/unifdef/tests/args2.expout
index 000000000000,8fe476b18ee2..8fe476b18ee2
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args2.expout
+++ b/contrib/unifdef/tests/args2.expout
diff --cc contrib/unifdef/tests/args2.exprc
index 000000000000,573541ac9702..573541ac9702
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args2.exprc
+++ b/contrib/unifdef/tests/args2.exprc
diff --cc contrib/unifdef/tests/args2.sh
index 000000000000,19fb26136b0b..19fb26136b0b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/args2.sh
+++ b/contrib/unifdef/tests/args2.sh
diff --cc contrib/unifdef/tests/blank0d.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0d.c
+++ b/contrib/unifdef/tests/blank0d.c
diff --cc contrib/unifdef/tests/blank0d.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank0d.experr
diff --cc contrib/unifdef/tests/blank0d.expout
index 000000000000,9c2261485ba5..9c2261485ba5
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0d.expout
+++ b/contrib/unifdef/tests/blank0d.expout
diff --cc contrib/unifdef/tests/blank0d.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0d.exprc
+++ b/contrib/unifdef/tests/blank0d.exprc
diff --cc contrib/unifdef/tests/blank0d.sh
index 000000000000,f0af220989d1..f0af220989d1
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0d.sh
+++ b/contrib/unifdef/tests/blank0d.sh
diff --cc contrib/unifdef/tests/blank0u.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0u.c
+++ b/contrib/unifdef/tests/blank0u.c
diff --cc contrib/unifdef/tests/blank0u.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank0u.experr
diff --cc contrib/unifdef/tests/blank0u.expout
index 000000000000,165d0a903525..165d0a903525
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0u.expout
+++ b/contrib/unifdef/tests/blank0u.expout
diff --cc contrib/unifdef/tests/blank0u.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0u.exprc
+++ b/contrib/unifdef/tests/blank0u.exprc
diff --cc contrib/unifdef/tests/blank0u.sh
index 000000000000,22a8360282c2..22a8360282c2
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank0u.sh
+++ b/contrib/unifdef/tests/blank0u.sh
diff --cc contrib/unifdef/tests/blank1d.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1d.c
+++ b/contrib/unifdef/tests/blank1d.c
diff --cc contrib/unifdef/tests/blank1d.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank1d.experr
diff --cc contrib/unifdef/tests/blank1d.expout
index 000000000000,05f6bc538b88..05f6bc538b88
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1d.expout
+++ b/contrib/unifdef/tests/blank1d.expout
diff --cc contrib/unifdef/tests/blank1d.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1d.exprc
+++ b/contrib/unifdef/tests/blank1d.exprc
diff --cc contrib/unifdef/tests/blank1d.sh
index 000000000000,4820efd723b9..4820efd723b9
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1d.sh
+++ b/contrib/unifdef/tests/blank1d.sh
diff --cc contrib/unifdef/tests/blank1u.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1u.c
+++ b/contrib/unifdef/tests/blank1u.c
diff --cc contrib/unifdef/tests/blank1u.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank1u.experr
diff --cc contrib/unifdef/tests/blank1u.expout
index 000000000000,f79337918e0e..f79337918e0e
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1u.expout
+++ b/contrib/unifdef/tests/blank1u.expout
diff --cc contrib/unifdef/tests/blank1u.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1u.exprc
+++ b/contrib/unifdef/tests/blank1u.exprc
diff --cc contrib/unifdef/tests/blank1u.sh
index 000000000000,1dbd849b018f..1dbd849b018f
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank1u.sh
+++ b/contrib/unifdef/tests/blank1u.sh
diff --cc contrib/unifdef/tests/blank2d.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2d.c
+++ b/contrib/unifdef/tests/blank2d.c
diff --cc contrib/unifdef/tests/blank2d.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank2d.experr
diff --cc contrib/unifdef/tests/blank2d.expout
index 000000000000,ba127f52e4f1..ba127f52e4f1
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2d.expout
+++ b/contrib/unifdef/tests/blank2d.expout
diff --cc contrib/unifdef/tests/blank2d.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2d.exprc
+++ b/contrib/unifdef/tests/blank2d.exprc
diff --cc contrib/unifdef/tests/blank2d.sh
index 000000000000,a38cb0cee808..a38cb0cee808
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2d.sh
+++ b/contrib/unifdef/tests/blank2d.sh
diff --cc contrib/unifdef/tests/blank2u.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2u.c
+++ b/contrib/unifdef/tests/blank2u.c
diff --cc contrib/unifdef/tests/blank2u.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank2u.experr
diff --cc contrib/unifdef/tests/blank2u.expout
index 000000000000,cee6dd72eb9a..cee6dd72eb9a
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2u.expout
+++ b/contrib/unifdef/tests/blank2u.expout
diff --cc contrib/unifdef/tests/blank2u.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2u.exprc
+++ b/contrib/unifdef/tests/blank2u.exprc
diff --cc contrib/unifdef/tests/blank2u.sh
index 000000000000,70b5440fe28c..70b5440fe28c
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank2u.sh
+++ b/contrib/unifdef/tests/blank2u.sh
diff --cc contrib/unifdef/tests/blank3d.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3d.c
+++ b/contrib/unifdef/tests/blank3d.c
diff --cc contrib/unifdef/tests/blank3d.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank3d.experr
diff --cc contrib/unifdef/tests/blank3d.expout
index 000000000000,31a633a0ea57..31a633a0ea57
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3d.expout
+++ b/contrib/unifdef/tests/blank3d.expout
diff --cc contrib/unifdef/tests/blank3d.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3d.exprc
+++ b/contrib/unifdef/tests/blank3d.exprc
diff --cc contrib/unifdef/tests/blank3d.sh
index 000000000000,8e71cbec759f..8e71cbec759f
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3d.sh
+++ b/contrib/unifdef/tests/blank3d.sh
diff --cc contrib/unifdef/tests/blank3u.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3u.c
+++ b/contrib/unifdef/tests/blank3u.c
diff --cc contrib/unifdef/tests/blank3u.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/unifdef/tests/blank3u.experr
diff --cc contrib/unifdef/tests/blank3u.expout
index 000000000000,d90cca9c6168..d90cca9c6168
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3u.expout
+++ b/contrib/unifdef/tests/blank3u.expout
diff --cc contrib/unifdef/tests/blank3u.exprc
index 000000000000,d00491fd7e5b..d00491fd7e5b
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3u.exprc
+++ b/contrib/unifdef/tests/blank3u.exprc
diff --cc contrib/unifdef/tests/blank3u.sh
index 000000000000,c1e8f20d2bc8..c1e8f20d2bc8
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank3u.sh
+++ b/contrib/unifdef/tests/blank3u.sh
diff --cc contrib/unifdef/tests/blank4d.c
index 000000000000,c435ac5b6224..c435ac5b6224
mode 000000,100644..100644
--- a/contrib/unifdef/tests/blank4d.c
+++ b/contrib/unifdef/tests/blank4d.c
diff --cc contrib/unifdef/tests/blank4d.experr
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
*** 1813 LINES SKIPPED ***