bug-texinfo
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: texinfo-6.8.90 pretest


From: Eli Zaretskii
Subject: Re: texinfo-6.8.90 pretest
Date: Sat, 22 Oct 2022 22:38:07 +0300

> From: Gavin Smith <gavinsmith0123@gmail.com>
> Date: Sat, 22 Oct 2022 20:14:59 +0100
> Cc: Patrice Dumas <pertusus@free.fr>, bug-texinfo@gnu.org
> 
> On Sat, Oct 22, 2022 at 11:57:36AM +0300, Eli Zaretskii wrote:
> 
> > --- ./tp/Texinfo/XS/XSParagraph.c~0 2022-02-12 00:01:48.000000000 +0200
> > +++ ./tp/Texinfo/XS/XSParagraph.c   2022-10-22 10:52:27.900000000 +0300
> > @@ -14,6 +14,12 @@
> >  #define PERL_NO_GET_CONTEXT
> >  #include "EXTERN.h"
> >  #include "perl.h"
> > +#if defined _WIN32 && !defined __CYGWIN__
> > +  #undef putenv
> > +  #undef fdopen
> > +  #undef mktemp
> > +  #undef free
> > +#endif
> >  #include "XSUB.h"
> >  
> >  #include "ppport.h"
> > 
> > A similar block of #undef's is needed in api.c, for the same reason.
> 
> I've added these blocks of #undef's in commit 5c1874da10e984.  I put
> them before including any of the Perl header files.

No, those #undef's must be after including perl.h and before XSUB.h.
That's because the Gnulib's stdlib.h is included by Perl's perl.h:

     In file included from D:/usr/Perl/lib/CORE/perl.h:766,
                      from XSParagraph.xs:7:
     ./gnulib/lib/stdlib.h:1374: note: this is the location of the previous 
definition
      1374 | #   define putenv _putenv
           |

> So I expect we can deal with putenv and mktemp the same way.  (I haven't
> investigated why Gnulib wants to redefine 'free'.)
> 
> It could be worth asking on bug-gnulib again.

OK, so I guess those #undef's might not be needed?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]