Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 20609: /trunk//trunk/:config.h.win32
Hi Ulf
20614 builds for me. I haven't had a chance to look at it in any more
detail yet. If I get time I will try to test some of the invalid
configurations to see if the logic actually catches the invalid cases!
(I assume you can confirm that it works for the 2005 build).
I have a feeling that preprocessor is just being too tolerant, and that
we need to define some of these constants in the makefile calls.
Cheers
Doug
> -----Original Message-----
> From: wireshark-dev-bounces@xxxxxxxxxxxxx
> [mailto:wireshark-dev-bounces@xxxxxxxxxxxxx] On Behalf Of Ulf Lamping
> Sent: 30 January 2007 13:37
> To: Developer support list for Wireshark
> Subject: Re: [Wireshark-dev] [Wireshark-commits] rev 20609:
> /trunk//trunk/:config.h.win32
>
> Douglas Pratley wrote:
> > The logic of this looks wrong to me in one sense - the
> message tells
> > you that your compiler is 14.00 when it is not (I'm still using
> > 12.00). I would have thought it should be reversed, so that given a
> > compiler number, it checks that the variant is one of the
> accepted values.
> >
> > More importantly, I tried adding these lines:
> >
> > #define WS_TO_STRING2(x) #x
> > #define WS_TO_STRING(x) WS_TO_STRING2(x) #pragma message(
> "_MSC_VER: "
> > WS_TO_STRING(_MSC_VER)) #pragma message( "MSVC_VARIANT: "
> > WS_TO_STRING(MSVC_VARIANT) )
> >
> > I then get:
> >
> > _MSC_VER: 1200
> > MSVC_VARIANT: MSVC_VARIANT
> >
> > I don't think that MSVC_VARIANT, or any of the constants it's being
> > compared against, are actually getting defined.
> >
> > I can't see anything in config.nmake that would actually
> cause them to
> > be passed to the preprocessor. Am I missing something?
> >
> Could you check 20614 instead? At least I've fixed the check
> logic in config.h here.
>
> As you point it out, I don't know why the config.h lines:
> #elseif _MSC_VER == 1200 && (MSVC_VARIANT != MSVC6) #error
> Your MSVC_VARIANT setting in config.nmake and the C compiler
> version 12.00 (V6.0) don't match!
>
> don't trigger an error now (it doesn't do in the builtbot) -
> as MSVC_VARIANT isn't defined at all, it shouldn't be MSVC6 ?!?
>
> We might need to add something like:
> -DMSVC_VARIANT=$(MSVC_VARIANT) (I don't have the right syntax
> at hand) to the Makefile.nmake CFLAGS.
>
> I currently don't really know why it currently doesn't throw
> a compiler error - but it obviously don't do it now (seems
> I'm missing something
> here?!?) ...
>
> Regards, ULFL
> _______________________________________________
> Wireshark-dev mailing list
> Wireshark-dev@xxxxxxxxxxxxx
> http://www.wireshark.org/mailman/listinfo/wireshark-dev
>
This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately.
Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. The contents of this email may relate to dealings with other companies within the Detica Group plc group of companies.
Detica Limited is registered in England under No: 1337451.
Registered offices: Surrey Research Park, Guildford, Surrey, GU2 7YP, England.
