svn commit: r416671 - in /incubator/harmony/enhanced/classlib/trunk: modules/luni/ modules/luni/src/main/native/include/linux/ modules/luni/src/main/native/include/shared/ modules/luni/src/main/native/include/windows/ native-src/linux.IA32/luni/ native...

[hi...@apache.org]

Author: hindessm
Date: Fri Jun 23 04:15:35 2006
New Revision: 416671

URL: http://svn.apache.org/viewvc?rev=416671&view=rev
Log:
Applying "[#HARMONY-646] [classlib][native]Remove portsock.h and use hysock.h instead".

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hyportpg.h
      - copied unchanged from r416584, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportpg.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hysock.h
      - copied unchanged from r416584, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysock.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hyportpg.h
      - copied unchanged from r416584, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hyportpg.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hysock.h
      - copied unchanged from r416584, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysock.h
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/portsock.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportpg.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysock.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hyportpg.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysock.h
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystemLinux.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyfile.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/inetadds.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/nethelp.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/socket.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/helpers.c

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Fri Jun 23 04:15:35 2006
@@ -62,6 +62,8 @@
 	    <fileset dir="${hy.luni.src.main.native}/include/windows">
     		<include name="hymutex.h" />
     		<include name="jclprots.h" />
+    		<include name="hysock.h" />
+    		<include name="hyportpg.h" />
     	    </fileset>
 	</copy>
     </target>
@@ -71,6 +73,8 @@
 	    <fileset dir="${hy.luni.src.main.native}/include/linux">
     		<include name="hymutex.h" />
     		<include name="jclprots.h" />
+    		<include name="hysock.h" />
+    		<include name="hyportpg.h" />
     	    </fileset>
 	</copy>
     </target>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystemLinux.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystemLinux.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystemLinux.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystemLinux.c Fri Jun 23 04:15:35 2006
@@ -18,7 +18,7 @@
 #include<netinet/in_systm.h>
 #include "nethelp.h"
 #include "jclglob.h"
-#include "portsock.h"
+#include "hysock.h"
 #include "hyport.h"
 #include "OSNetworkSystem.h"
 #define NOPRIVILEGE -1

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyfile.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyfile.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyfile.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyfile.c Fri Jun 23 04:15:35 2006
@@ -31,7 +31,7 @@
 #include <time.h>
 
 #include "hyport.h"
-#include "portsock.h"
+#include "hysock.h"
 #include "hystdarg.h"
 #include "portnls.h"
 #include "ut_hyprt.h"

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.c Fri Jun 23 04:15:35 2006
@@ -19,7 +19,7 @@
 #include "nethelp.h"
 #include "helpers.h"
 #include "jclprots.h"
-#include "portsock.h"
+#include "hysock.h"
 #include "socket.h"
 #include "jclglob.h"
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/inetadds.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/inetadds.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/inetadds.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/inetadds.c Fri Jun 23 04:15:35 2006
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include "jclprots.h"
 #include "nethelp.h"
-#include "portsock.h"
+#include "hysock.h"
 #include "jclglob.h"
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/nethelp.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/nethelp.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/nethelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/nethelp.c Fri Jun 23 04:15:35 2006
@@ -14,7 +14,7 @@
  */
 
 #include "nethelp.h"
-#include "portsock.h"
+#include "hysock.h"
 #include "hyport.h"
 #include "jclglob.h"
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c Fri Jun 23 04:15:35 2006
@@ -17,7 +17,7 @@
 #include "jclprots.h"
 #include "helpers.h"
 #include "jclglob.h"
-#include "portsock.h"
+#include "hysock.h"
 
 /**
  * Answer an array of NetworkInterface objects.  One for each network interface within the system

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/socket.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/socket.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/socket.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/socket.c Fri Jun 23 04:15:35 2006
@@ -17,7 +17,7 @@
 #include "jclprots.h"
 #include "helpers.h"
 #include "jclglob.h"
-#include "portsock.h"
+#include "hysock.h"
 
 #define BROKEN_MULTICAST_IF 1
 #define BROKEN_MULTICAST_TTL 2

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c Fri Jun 23 04:15:35 2006
@@ -21,7 +21,7 @@
 #include "jclglob.h"
 #include "OSNetworkSystem.h"
 #include "nethelp.h"
-#include "portsock.h"
+#include "hysock.h"
 #define NOPRIVILEGE -1
 #define UNREACHABLE -2
 #define REACHABLE 0

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/helpers.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/helpers.c?rev=416671&r1=416670&r2=416671&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/helpers.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/helpers.c Fri Jun 23 04:15:35 2006
@@ -30,7 +30,7 @@
 #include "jclprots.h"
 #include "jclglob.h"
 
-#include "portsock.h"
+#include "hysock.h"
 
 int platformReadLink (char *link);
 jbyteArray getPlatformPath (JNIEnv * env, jbyteArray path);