]> Savannah Git Hosting - gnulib.git/commitdiff
Implement a way to opt out from MSVC support, part 2.
authorBruno Haible <bruno@clisp.org>
Wed, 10 May 2017 21:39:15 +0000 (23:39 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 10 May 2017 21:39:15 +0000 (23:39 +0200)
* modules/msvc-inval (Include): Document recommended idiom.
* modules/msvc-nothrow (Include): Likewise.

ChangeLog
modules/msvc-inval
modules/msvc-nothrow

index 35cd42058f4cee2b166278aeaf06aafc38983928..9c0d3b85b61bd7204d061ba4d6d0fafc644f8cdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-10 Bruno Haible  <bruno@clisp.org>
 
+       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.
index ea1a7af8e93d43daf14ddda5c8f6df793cdcdded..5907190b1a866898a57195d80dde45cea5f3cc1b 100644 (file)
@@ -17,7 +17,9 @@ fi
 Makefile.am:
 
 Include:
-"msvc-inval.h"
+#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+# include "msvc-inval.h"
+#endif
 
 License:
 LGPLv2+
index d187eea03368d3cdd4c96ce92030967446258318..4cb5834b74044714babdfd5ca272d5cd59617ff5 100644 (file)
@@ -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 <io.h>
+#endif
 
 License:
 LGPLv2+