From f16bb1a764c350cd9adf9f40b47ae93fb5660262 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 10 May 2017 23:39:15 +0200 Subject: [PATCH] Implement a way to opt out from MSVC support, part 2. * modules/msvc-inval (Include): Document recommended idiom. * modules/msvc-nothrow (Include): Likewise. --- ChangeLog | 4 ++++ modules/msvc-inval | 4 +++- modules/msvc-nothrow | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35cd42058f..9c0d3b85b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-05-10 Bruno Haible + Implement a way to opt out from MSVC support, part 2. + * modules/msvc-inval (Include): Document recommended idiom. + * modules/msvc-nothrow (Include): Likewise. + Implement a way to opt out from MSVC support. This is useful for Emacs. * modules/msvc-nothrow (configure.ac): Invoke gl_MODULE_INDICATOR. diff --git a/modules/msvc-inval b/modules/msvc-inval index ea1a7af8e9..5907190b1a 100644 --- a/modules/msvc-inval +++ b/modules/msvc-inval @@ -17,7 +17,9 @@ fi Makefile.am: Include: -"msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif License: LGPLv2+ diff --git a/modules/msvc-nothrow b/modules/msvc-nothrow index d187eea033..4cb5834b74 100644 --- a/modules/msvc-nothrow +++ b/modules/msvc-nothrow @@ -20,7 +20,11 @@ gl_MODULE_INDICATOR([msvc-nothrow]) Makefile.am: Include: -"msvc-nothrow.h" +#if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +#else +# include +#endif License: LGPLv2+ -- 2.39.5