summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-30 22:21:44 +0000
committerKarl Berry <karl@freefriends.org>2024-01-30 22:21:44 +0000
commitc69af6d77082cf8c61fa7235a2a008dc2fae8d69 (patch)
tree7d8df7681da540f77ad0b17f8dacac3207e46d90 /Build
parent876f3927fd2d54a94d8cd2ddc6655b80217c9640 (diff)
do not use cpp symbol "unix", not defined by clang on mac
git-svn-id: svn://tug.org/texlive/trunk@69641 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/tex-file.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index c76e4c69ab2..6a2c61c8c97 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2024-01-30 Karl Berry <karl@freefriends.org>
+
+ * tex-file.c (kpathsea_name_ok) [MSDOS]: remove [unix] from cpp
+ test, since it's not defined by clang. See thread surrounding
+ https://tug.org/pipermail/tlbuild/2024q1/005408.html.
+
2024-01-27 Karl Berry <karl@freefriends.org>
* tex-file.c (kpathsea_name_ok):
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index a9f7c4977be..f5c7a5f2bc4 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -1257,8 +1257,8 @@ kpathsea_name_ok (kpathsea kpse, const_string fname, const_string check_var,
since TEXMFVAR is typically ~/.texliveYYYY, and we want to allow it. */
expanded_fname = kpathsea_expand (kpse, fname);
-#if defined (unix) && !defined (MSDOS)
- {
+#ifndef MSDOS
+ { /* On non-Windows ... */
/* Disallow .rhosts, .login, .ssh/, ..somefile, ..somedir/somefile,
etc. But allow .tex (for base LaTeX). Also specially allow
/foo/.whatever if extended, since it might match against
@@ -1286,9 +1286,9 @@ kpathsea_name_ok (kpathsea kpse, const_string fname, const_string check_var,
qq = q + 1;
}
}
-#else
+#else /* MSDOS */
/* Other OSs don't have special names? */
-#endif
+#endif /* MSDOS */
/* If setting is only r(estricted), we're done. (Not a useful setting
in practice, but no reason to take it out now.) */