summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w4
2 files changed, 10 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index f2fb620efc4..cdcca76465f 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-06 Akira Kakuto <kakuto@w32tex.org>
+
+ * mp.w: Avoid C1017 error in the case of MSC.
+ The preprocessor macro #if INTEGER_TYPE == long
+ is OK in gcc, but gives C1017 error in MSC.
+
2019-01-28 Andreas Scherer <https://ascherer.github.io>
* mpost.w: TeXnical nitpicking.
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index e0999e187f5..77e33f8ff0e 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -127,6 +127,7 @@ typedef int boolean;
typedef int integer;
#define MPOST_ABS abs
#else
+#ifndef _MSC_VER
/* See source/texk/web2c/w2c/config.h */
#if INTEGER_TYPE == long
#ifdef HAVE_LABS
@@ -137,6 +138,9 @@ typedef int integer;
#else
#define MPOST_ABS abs
#endif /* if INTEGER_TYPE == long */
+#else /* _MSC_VER */
+#define MPOST_ABS abs
+#endif /* !_MSC_VER */
#endif /* ifndef INTEGER_TYPE */