From b55a085bbebf867ee1a8b0f9dd088a65508c6a22 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 7 Jun 2017 15:23:38 +0200 Subject: [PATCH] canonicalize-lgpl: Avoid conflict with gnulib 'getcwd' module on VMS. Reported by John E. Malmberg in . * lib/canonicalize-lgpl.c (__getcwd): On VMS, when using gnulib's getcwd override, pass 2 arguments to getcwd, not 3. --- ChangeLog | 8 ++++++++ lib/canonicalize-lgpl.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4294d512a5..af6de61113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-06-07 Bruno Haible + + canonicalize-lgpl: Avoid conflict with gnulib 'getcwd' module on VMS. + Reported by John E. Malmberg in + . + * lib/canonicalize-lgpl.c (__getcwd): On VMS, when using gnulib's getcwd + override, pass 2 arguments to getcwd, not 3. + 2017-06-04 Paul Eggert same-inode: port better to VMS 8.2 and later diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index a32da91a9a..34b3711b2c 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -59,8 +59,10 @@ */ # undef getcwd # endif -# ifdef VMS - /* We want the directory in Unix syntax, not in VMS syntax. */ +# if defined VMS && !defined getcwd + /* We want the directory in Unix syntax, not in VMS syntax. + The gnulib override of 'getcwd' takes 2 arguments; the original VMS + 'getcwd' takes 3 arguments. */ # define __getcwd(buf, max) getcwd (buf, max, 0) # else # define __getcwd getcwd -- 2.39.5