--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-03  Bruno Haible  <bruno@clisp.org>
+
+	wmemchr: Support for MSVC.
+	* m4/wmemchr.m4 (gl_FUNC_WMEMCHR): Use a small test program to test
+	whether wmemchr() exists.
+
 2011-10-03  Bruno Haible  <bruno@clisp.org>
 
 	glthread/*, strsignal: Support for MSVC.

--- a/m4/wmemchr.m4
+++ b/m4/wmemchr.m4
@@ -1,4 +1,4 @@
-# wmemchr.m4 serial 2
+# wmemchr.m4 serial 3
 dnl Copyright (C) 2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,8 +7,26 @@
 AC_DEFUN([gl_FUNC_WMEMCHR],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([wmemchr])
-  if test $ac_cv_func_wmemchr = no; then
+  dnl We cannot use AC_CHECK_FUNCS here, because the MSVC 9 header files
+  dnl provide this function as an inline function definition.
+  AC_CACHE_CHECK([for wmemchr], [gl_cv_func_wmemchr],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+]],
+          [[return ! wmemchr ((const wchar_t *) 0, (wchar_t) ' ', 0);]])
+       ],
+       [gl_cv_func_wmemchr=yes],
+       [gl_cv_func_wmemchr=no])
+    ])
+  if test $gl_cv_func_wmemchr = no; then
     HAVE_WMEMCHR=0
   fi
 ])