harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r893423 - /harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
Date Wed, 23 Dec 2009 08:13:04 GMT
Author: tonywu
Date: Wed Dec 23 08:13:03 2009
New Revision: 893423

URL: http://svn.apache.org/viewvc?rev=893423&view=rev
Log:
Fix a redefinition error when building with VS 2008

Modified:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c?rev=893423&r1=893422&r2=893423&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
Wed Dec 23 08:13:03 2009
@@ -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->OperStatus & flag) == flag);
 						break;
-					case IFTYPE:
+					case INTERFACETYPE:
 						if(flag == IF_TYPE_PPP && isIPv6)
 							isSet = ((AdapterAddresses->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_SOFTWARE_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_PPP);
+	return getPlatformNetworkInterfaceAttribute(env,INTERFACETYPE,jindex,IF_TYPE_PPP);
 }
 
 



Mime
View raw message