From 28f892a061190700f111ba66c03b75cdc96e69b4 Mon Sep 17 00:00:00 2001 From: Bruno Haible <bruno@clisp.org> Date: Tue, 4 Oct 2011 01:50:45 +0200 Subject: [PATCH] wmemmove: Support for MSVC. * m4/wmemmove.m4 (gl_FUNC_WMEMMOVE): Use a small test program to test whether wmemmove() exists. --- ChangeLog | 6 ++++++ m4/wmemmove.m4 | 24 +++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cf617d644..55d8c82a25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-03 Bruno Haible <bruno@clisp.org> + + wmemmove: Support for MSVC. + * m4/wmemmove.m4 (gl_FUNC_WMEMMOVE): Use a small test program to test + whether wmemmove() exists. + 2011-10-03 Bruno Haible <bruno@clisp.org> wmemcpy: Support for MSVC. diff --git a/m4/wmemmove.m4 b/m4/wmemmove.m4 index 73884c803b..5f1cf0c428 100644 --- a/m4/wmemmove.m4 +++ b/m4/wmemmove.m4 @@ -1,4 +1,4 @@ -# wmemmove.m4 serial 2 +# wmemmove.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 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_WMEMMOVE], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([wmemmove]) - if test $ac_cv_func_wmemmove = 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 wmemmove], [gl_cv_func_wmemmove], + [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 ! wmemmove ((wchar_t *) 0, (const wchar_t *) 0, 0);]]) + ], + [gl_cv_func_wmemmove=yes], + [gl_cv_func_wmemmove=no]) + ]) + if test $gl_cv_func_wmemmove = no; then HAVE_WMEMMOVE=0 fi ]) -- 2.39.5