harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tony Wu <wuyue...@gmail.com>
Subject Re: request to commit a fix for VS2008 compiler error
Date Wed, 23 Dec 2009 08:14:03 GMT
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> wrote:
>>>> 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/helpers.c
>>>>> ===================================================================
>>>>> --- working_classlib/modules/luni/src/main/native/luni/windows/helpers.c
>>>>> (revision 893171)
>>>>> +++ working_classlib/modules/luni/src/main/native/luni/windows/helpers.c
>>>>> (working copy)
>>>>> @@ -62,7 +62,7 @@
>>>>>  I_32 getPlatformAttribute (JNIEnv * env, char *path, DWORD attribute);
>>>>>  typedef enum {
>>>>>        OPERSTAT,
>>>>> -       IFTYPE,
>>>>> +       INTERFACETYPE,
>>>>>        FLAGS,
>>>>>        MTU
>>>>>  }FLAGTYPE;
>>>>> @@ -734,7 +734,7 @@
>>>>>                                        case OPERSTAT:
>>>>>                                              
 isSet = ((AdapterAddresses->Oper
>>>>> Status & flag) == flag);
>>>>>                                              
 break;
>>>>> -                                       case IFTYPE:
>>>>> +                                       case INTERFACETYPE:
>>>>>                                              
 if(flag == IF_TYPE_PPP && isIPv6
>>>>> )
>>>>>                                              
         isSet = ((AdapterAddress
>>>>> es->IfType & IF_TYPE_TUNNEL) == IF_TYPE_TUNNEL);
>>>>>                                              
 else
>>>>> @@ -769,12 +769,12 @@
>>>>>
>>>>>  jboolean getPlatformIsLoopback(JNIEnv * env, jstring ifname, jint jindex)
>>>>>  {
>>>>> -       return getPlatformNetworkInterfaceAttribute(env,IFTYPE,jindex,IF_TYPE_SO
>>>>> FTWARE_LOOPBACK);
>>>>> +       return getPlatformNetworkInterfaceAttribute(env,INTERFACETYPE,jindex,IF_
>>>>> TYPE_SOFTWARE_LOOPBACK);
>>>>>  }
>>>>>
>>>>>  jboolean getPlatformIsPoint2Point(JNIEnv * env, jstring ifname, jint
jindex)
>>>>>  {
>>>>> -       return getPlatformNetworkInterfaceAttribute(env,IFTYPE,jindex,IF_TYPE_PP
>>>>> P);
>>>>> +       return getPlatformNetworkInterfaceAttribute(env,INTERFACETYPE,jindex,IF_
>>>>> TYPE_PPP);
>>>>>  }
>>>>>
>>>>> --
>>>>> Tony Wu
>>>>> China Software Development Lab, IBM
>>>>>
>>>>
>>>
>>>
>>>
>>> --
>>> Tony Wu
>>> China Software Development Lab, IBM
>>>
>>
>



-- 
Tony Wu
China Software Development Lab, IBM

Mime
View raw message