Mailing-List: contact dev-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Received-SPF: pass (athena.apache.org: domain of wuyuehao@gmail.com designates
 209.85.216.183 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type:content-transfer-encoding;
        b=IbguNM3o0Lc7R1kw31RRtyc6aNzLeGpMJMUh8UH/DJMmI7pHksFN97KzOPl59CUB6g
         Fw6Y4ygGBw2E8hIB5W6Rf2muUT9g1/Hfq2tnV//EWqSysm36SU9VgIZhvy7NynZAGJd/
         U43A0eeWqpu2lQHEydWbgw584UT4YfnVqEhgg=
MIME-Version: 1.0
In-Reply-To: <3b3f27c60912222139k234819ffq72f91dc02c14b874@mail.gmail.com>
References: <211709bc0912220615m243a2ea9l9666a033c4c059ca@mail.gmail.com>
	 <3b3f27c60912221007y1bfd8a59kc2a963ae1f059286@mail.gmail.com>
	 <211709bc0912221725h6019b499u80b4603f60bf8cbe@mail.gmail.com>
	 <3b3f27c60912221827jfb50d0fwc1ffd84e81801c24@mail.gmail.com>
	 <3b3f27c60912222139k234819ffq72f91dc02c14b874@mail.gmail.com>
Date: Wed, 23 Dec 2009 16:14:03 +0800
Message-ID: <211709bc0912230014r2ee48dc3j1d9ea14e7555d47b@mail.gmail.com>
Subject: Re: request to commit a fix for VS2008 compiler error
From: Tony Wu <wuyuehao@gmail.com>
To: dev@harmony.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Committed revision 893423. Thanks Nathan.

On Wed, Dec 23, 2009 at 1:39 PM, Nathan Beyer <ndbeyer@apache.org> wrote:
> This change seems to work fine for me, so +1.
>
> On Tue, Dec 22, 2009 at 8:27 PM, Nathan Beyer <ndbeyer@apache.org> wrote:
>> On Tue, Dec 22, 2009 at 7:25 PM, Tony Wu <wuyuehao@gmail.com> wrote:
>>> there is no IFTYPE on trunk so it's not necessary to apply it there.
>>
>> Okay, i'm going to test it out quick.
>>
>>>
>>> On Wed, Dec 23, 2009 at 2:07 AM, Nathan Beyer <ndbeyer@apache.org> wrot=
e:
>>>> Would this change be applied to the trunk as well as the branch? If
>>>> so, I'd rather see the code committed there and then the approval be
>>>> for a merge.
>>>>
>>>> -Nathan
>>>>
>>>> On Tue, Dec 22, 2009 at 8:15 AM, Tony Wu <wuyuehao@gmail.com> wrote:
>>>>> Hi,
>>>>>
>>>>> This is a redefination error because VS2008 defines the IFTYPE too.
>>>>> simply %s/IFTYPE/INTERFACTTYPE/g on helpers.c could fix it.
>>>>>
>>>>> Index: working_classlib/modules/luni/src/main/native/luni/windows/hel=
pers.c
>>>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>>>>> --- working_classlib/modules/luni/src/main/native/luni/windows/helper=
s.c
>>>>> (revision 893171)
>>>>> +++ working_classlib/modules/luni/src/main/native/luni/windows/helper=
s.c
>>>>> (working copy)
>>>>> @@ -62,7 +62,7 @@
>>>>> =A0I_32 getPlatformAttribute (JNIEnv * env, char *path, DWORD attribu=
te);
>>>>> =A0typedef enum {
>>>>> =A0 =A0 =A0 =A0OPERSTAT,
>>>>> - =A0 =A0 =A0 IFTYPE,
>>>>> + =A0 =A0 =A0 INTERFACETYPE,
>>>>> =A0 =A0 =A0 =A0FLAGS,
>>>>> =A0 =A0 =A0 =A0MTU
>>>>> =A0}FLAGTYPE;
>>>>> @@ -734,7 +734,7 @@
>>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0case OPERSTAT:
>>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0isSet =3D ((AdapterAddresses->Oper
>>>>> Status & flag) =3D=3D flag);
>>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0break;
>>>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 case IFTYPE:
>>>>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 case INTERFACETYPE:
>>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0if(flag =3D=3D IF_TYPE_PPP && isIPv6
>>>>> )
>>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0isSet =3D ((AdapterAddress
>>>>> es->IfType & IF_TYPE_TUNNEL) =3D=3D IF_TYPE_TUNNEL);
>>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0else
>>>>> @@ -769,12 +769,12 @@
>>>>>
>>>>> =A0jboolean getPlatformIsLoopback(JNIEnv * env, jstring ifname, jint =
jindex)
>>>>> =A0{
>>>>> - =A0 =A0 =A0 return getPlatformNetworkInterfaceAttribute(env,IFTYPE,=
jindex,IF_TYPE_SO
>>>>> FTWARE_LOOPBACK);
>>>>> + =A0 =A0 =A0 return getPlatformNetworkInterfaceAttribute(env,INTERFA=
CETYPE,jindex,IF_
>>>>> TYPE_SOFTWARE_LOOPBACK);
>>>>> =A0}
>>>>>
>>>>> =A0jboolean getPlatformIsPoint2Point(JNIEnv * env, jstring ifname, ji=
nt jindex)
>>>>> =A0{
>>>>> - =A0 =A0 =A0 return getPlatformNetworkInterfaceAttribute(env,IFTYPE,=
jindex,IF_TYPE_PP
>>>>> P);
>>>>> + =A0 =A0 =A0 return getPlatformNetworkInterfaceAttribute(env,INTERFA=
CETYPE,jindex,IF_
>>>>> TYPE_PPP);
>>>>> =A0}
>>>>>
>>>>> --
>>>>> Tony Wu
>>>>> China Software Development Lab, IBM
>>>>>
>>>>
>>>
>>>
>>>
>>> --
>>> Tony Wu
>>> China Software Development Lab, IBM
>>>
>>
>


--=20
Tony Wu
China Software Development Lab, IBM