Re: [Bug-wget] recur.c compile error

[Tim Rühsen]

Am Samstag, 15. August 2015, 12:15:46 schrieb Darshit Shah:
> On Sat, Aug 15, 2015 at 1:33 AM, Gisle Vanem <address@hidden> wrote:
> > The new reject stuff in recur.c:
> >   typedef enum
> >   {
> >   
> >     SUCCESS, BLACKLIST, NOTHTTPS, NONHTTP, 1, 1, PARENT, LIST, REGEX,
> >     RULES, SPANNEDHOST, ROBOTS
> >   
> >   } reject_reason;
> > 
> > causes errors with MSVC and MingW since in:
> >   math.h:952:    #define DOMAIN  _DOMAIN i.e. 1
> >   wingdi.h:1893: #define ABSOLUTE    1
> > 
> > <math.h> is pulled in via some Gnulib headers. And <wingdi.h> via
> > <windows.h>. I suggest this simple fix:
> > 
> > --- a/src/recur.c   2015-08-14 21:45:44
> > +++ b/src/recur.c   2015-08-14 21:54:45
> > @@ -182,6 +182,9 @@
> > 
> >    return ret;
> >  
> >  }
> > 
> > +#undef ABSOLUTE
> > +#undef DOMAIN
> > +
> > 
> >  typedef enum
> >  {
> >  
> >    SUCCESS, BLACKLIST, NOTHTTPS, NONHTTP, ABSOLUTE, DOMAIN, PARENT, LIST,
> > 
> > REGEX,
> 
> I think this is an ugly solution.
> 
> > Or better names for the enumerations; 'RR_xx' ?
> 
> This is much better. We should rename our constants to something like WG_*.

ACK.

Maybe WG_RR_* ?

signature.asc
Description: This is a digitally signed message part.