From 7184ccd51bd1f1f20b7b21c1ce06cab6ace413e0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 12 Feb 2024 12:44:08 +0100 Subject: [PATCH] getcwd, getcwd-lgpl: Fix configure test. * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Don't redeclare getcwd(). --- ChangeLog | 5 +++++ m4/getcwd.m4 | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e357c4124..dfaef75fdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-02-12 Bruno Haible + + getcwd, getcwd-lgpl: Fix configure test. + * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Don't redeclare getcwd(). + 2024-02-12 Florian Weimer pthread_mutex_timedlock, pthread-spin: Fix configure test. diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 558a032f1b..ed3d7b610a 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -6,7 +6,7 @@ # with or without modifications, as long as this notice is preserved. # Written by Paul Eggert. -# serial 21 +# serial 22 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -21,11 +21,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], # else /* on Windows with MSVC */ # include # endif - ]GL_MDA_DEFINES[ -# ifndef getcwd - char *getcwd (); -# endif -]], [[ + ]GL_MDA_DEFINES], + [[ #if defined _WIN32 && ! defined __CYGWIN__ /* mingw cwd does not start with '/', but _getcwd does allocate. However, mingw fails to honor non-zero size. */ -- 2.39.5