From b655e1ef5e1ef5a7c7bac0b616c168ddd1bd8078 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 6 Mar 2019 15:44:21 +0000 Subject: Avoid C1017 error in the case of MSC. git-svn-id: svn://tug.org/texlive/trunk@50261 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/mplibdir/ChangeLog | 6 ++++++ Build/source/texk/web2c/mplibdir/mp.w | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'Build/source/texk/web2c/mplibdir') 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 + + * 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 * 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 */ -- cgit v1.2.3