From 3cf70e4eec91d4370889e9575a5c22679a984ebf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 4 Oct 2011 01:49:58 +0200 Subject: [PATCH] wmemcpy: Support for MSVC. * m4/wmemcpy.m4 (gl_FUNC_WMEMCPY): Use a small test program to test whether wmemcpy() exists. --- ChangeLog | 6 ++++++ m4/wmemcpy.m4 | 24 +++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 861eb7d6d..4cf617d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-10-03 Bruno Haible + wmemcpy: Support for MSVC. + * m4/wmemcpy.m4 (gl_FUNC_WMEMCPY): Use a small test program to test + whether wmemcpy() exists. + +2011-10-03 Bruno Haible + wmemcmp: Support for MSVC. * m4/wmemcmp.m4 (gl_FUNC_WMEMCMP): Use a small test program to test whether wmemcmp() exists. diff --git a/m4/wmemcpy.m4 b/m4/wmemcpy.m4 index 917c6031a..695de4676 100644 --- a/m4/wmemcpy.m4 +++ b/m4/wmemcpy.m4 @@ -1,4 +1,4 @@ -# wmemcpy.m4 serial 2 +# wmemcpy.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_WMEMCPY], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([wmemcpy]) - if test $ac_cv_func_wmemcpy = 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 wmemcpy], [gl_cv_func_wmemcpy], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be included + before . */ +#include +#include +#include +#include +]], + [[return ! wmemcpy ((wchar_t *) 0, (const wchar_t *) 0, 0);]]) + ], + [gl_cv_func_wmemcpy=yes], + [gl_cv_func_wmemcpy=no]) + ]) + if test $gl_cv_func_wmemcpy = no; then HAVE_WMEMCPY=0 fi ]) -- 2.11.0