summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-12-10 07:20:10 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-12-10 07:20:10 +0000
commit3bcafa158fa60fdfdefd9322940bc8694a3664b6 (patch)
treeb1c038c7392e0b09d8286addf07bde12226b4e37
parent9ff521723f30953002098cc56eab0783c3119851 (diff)
lib.h: def of eof() contradicts corecrt_io.h in VS 2019 (w32 only)
git-svn-id: svn://tug.org/texlive/trunk@57108 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/lib.h8
2 files changed, 13 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index f23f3dcc9f9..754f164b4d1 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-10 Akira Kakuto <kakuto@w32tex.org>
+
+ * lib.h: Definition of eof() contradicts corecrt_io.h
+ in Visual Studio 2019.
+
2020-09-24 Akira Kakuto <kakuto@w32tex.org>
* texmfmp.c: Call kpse_in_name_ok() in find_input_file() for
diff --git a/Build/source/texk/web2c/lib/lib.h b/Build/source/texk/web2c/lib/lib.h
index 039218b7d12..d54344a4b4f 100644
--- a/Build/source/texk/web2c/lib/lib.h
+++ b/Build/source/texk/web2c/lib/lib.h
@@ -11,6 +11,14 @@ extern string basenamechangesuffix (const_string, const_string, const_string);
extern string chartostring (char);
/* eofeoln.c */
+/*
+ * definition of eof() contradicts corecrt_io.h in Visual Studio 2019.
+ * 2010-12-10.
+ *
+ */
+#if defined(_MSC_VER) && _MSC_VER > 1916
+#define eof(x) myeof(x)
+#endif /* _MSC_VER */
extern boolean eof (FILE *);
extern boolean eoln (FILE *);
extern void readln (FILE *);