configure: use grep in quiet mode, rather than piping stderr/stdout to /dev/null

[mesa.git] / include / c99_compat.h

diff --git a/include/c99_compat.h b/include/c99_compat.h
index 3a9f502a7ea5edc6191392b0415dd8496053efca..429c6014845ac3470cc3b14860c6503ea7ccd2b4 100644 (file)
--- a/include/c99_compat.h
+++ b/include/c99_compat.h
@@ -37,12 +37,10 @@
     * Visual Studio 2012 will complain if we define the `inline` keyword, but
     * actually it only supports the keyword on C++.
     *
-    * We could skip this check by defining _ALLOW_KEYWORD_MACROS, but there is
-    * probably value in checking this for other keywords.  So simply include
-    * the checking before we define it below.
+    * To avoid this the _ALLOW_KEYWORD_MACROS must be set.
     */
-#  if _MSC_VER >= 1700
-#    include <xkeycheck.h>
+#  if (_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS)
+#    define _ALLOW_KEYWORD_MACROS
 #  endif
 
    /*