From: Bruno Haible Date: Mon, 9 Jan 2023 09:14:32 +0000 (+0100) Subject: gettime: Fix compilation error in C++ mode on Android. X-Git-Tag: v1.0~1877 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=25a5f3958d0b56c22a2d189962fa96573f0f60ed;p=gnulib.git gettime: Fix compilation error in C++ mode on Android. * m4/gettime.m4 (gl_CHECK_FUNC_TIMESPEC_GET): Also test whether timespec_get is declared. --- diff --git a/ChangeLog b/ChangeLog index 394a460a8e..5b0282dbb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-01-09 Bruno Haible + + gettime: Fix compilation error in C++ mode on Android. + * m4/gettime.m4 (gl_CHECK_FUNC_TIMESPEC_GET): Also test whether + timespec_get is declared. + 2023-01-09 Bruno Haible malloc-h: Fix compilation error in C++ mode on Android. diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 06f32fe26c..7e353fcd00 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,4 +1,4 @@ -# gettime.m4 serial 12 +# gettime.m4 serial 13 dnl Copyright (C) 2002, 2004-2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,17 +26,24 @@ AC_DEFUN([gl_CHECK_FUNC_TIMESPEC_GET], dnl We can't use AC_CHECK_FUNC here, because timespec_get() is defined as a dnl static inline function in on MSVC 14. - AC_CACHE_CHECK([for timespec_get], [gl_cv_func_timespec_get], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - struct timespec ts; - ]], - [[return timespec_get (&ts, 0);]]) - ], - [gl_cv_func_timespec_get=yes], - [gl_cv_func_timespec_get=no]) - ]) + dnl But at the same time, we need to notice a missing declaration, like + dnl gl_CHECK_FUNCS_ANDROID does. + AC_CHECK_DECL([timespec_get], , , [[#include ]]) + if test $ac_cv_have_decl_timespec_get = yes; then + AC_CACHE_CHECK([for timespec_get], [gl_cv_func_timespec_get], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + struct timespec ts; + ]], + [[return timespec_get (&ts, 0);]]) + ], + [gl_cv_func_timespec_get=yes], + [gl_cv_func_timespec_get=no]) + ]) + else + gl_cv_func_timespec_get=no + fi ]) AC_DEFUN([gl_GETTIME_RES],