harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r577602 - in /harmony/enhanced/classlib/trunk/modules/luni/src/main/native: include/unix/jclprots.h include/windows/jclprots.h luni/shared/harmonyglob.h
Date Thu, 20 Sep 2007 07:36:54 GMT
Author: hindessm
Date: Thu Sep 20 00:36:53 2007
New Revision: 577602

URL: http://svn.apache.org/viewvc?rev=577602&view=rev
Log:
Remove unused references to com.ibm.oti.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h?rev=577602&r1=577601&r2=577602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h Thu
Sep 20 00:36:53 2007
@@ -28,18 +28,6 @@
  ** COMPONENT: NativesCommon
  ************************************************************/
 
-/* NativesCommonComm*/
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_writeImpl PROTOTYPE((JNIEnv *env,
jobject jThis, jint osHandle, jbyteArray jBuffer, jint offset, jint length));
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_readImpl PROTOTYPE((JNIEnv *env,
jobject jThis, jint osHandle, jbyteArray jBuffer, jint offset, jint length));
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_getBaud PROTOTYPE((JNIEnv *env,
jobject jThis, jint osHandle));
-void JNICALL Java_com_ibm_oti_connection_comm_Connection_closeImpl PROTOTYPE((JNIEnv *env,
jobject jThis, jint osHandle));
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_openImpl PROTOTYPE((JNIEnv *env,
jobject jThis, jint jPortNum));
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_setBaud PROTOTYPE((JNIEnv *env,
jobject jThis, jint osHandle, jint baudrate));
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_openImpl2 PROTOTYPE((JNIEnv *env,
jobject jThis, jstring portName));
-void JNICALL Java_com_ibm_oti_connection_comm_Connection_configureImpl PROTOTYPE((JNIEnv
*env, jobject jThis, jint osHandle,
-jint baudrate, jint bitsPerChar, jint stopBits, jint parity, jboolean autoRTS, jboolean autoCTS,
jint timeout));
-jint JNICALL Java_com_ibm_oti_connection_comm_Connection_availableImpl PROTOTYPE((JNIEnv
*env, jobject jThis, jint osHandle));
-
 /* NativesCommonPlainServerSocketImpl*/
 void JNICALL Java_java_net_PlainServerSocketImpl_createServerStreamSocketImpl PROTOTYPE((
 	JNIEnv* env, jclass thisClz, jobject thisObjFD, jboolean preferIPv4Stack));
@@ -94,18 +82,6 @@
 jlong JNICALL Java_java_util_zip_CRC32_updateImpl PROTOTYPE(( JNIEnv * env, jobject recv,
jbyteArray buf, int off, int len, jlong crc));
 
 /* NativesCommonAnnotationHelper*/
-jobject JNICALL
-Java_com_ibm_oti_reflect_AnnotationHelper_getReturnValueForEntry PROTOTYPE((JNIEnv * env,
jclass unusedClazz, jclass clazz, jlong entryValue, jstring mName));
-jobjectArray JNICALL
-Java_com_ibm_oti_reflect_AnnotationHelper_getAnnotationEntries PROTOTYPE((JNIEnv * env, jclass
unusedClazz, jclass clazz, jint type, jobject obj));
-jobject JNICALL
-Java_com_ibm_oti_reflect_AnnotationHelper_getAnnotationClassNameForEntry PROTOTYPE((JNIEnv
* env, jclass unusedClazz, jlong entryValue));
-jobject JNICALL
-Java_com_ibm_oti_reflect_AnnotationHelper_getReturnValueFromEntry PROTOTYPE((JNIEnv * env,
jclass unusedClazz, jclass clazz, jclass annType, jlong entryValue, jstring mName));
-jobject JNICALL
-Java_com_ibm_oti_reflect_AnnotationHelper_getDefaultReturnValue PROTOTYPE((JNIEnv * env,
jclass unusedClazz, jclass clazz, jobject obj));
-jobject JNICALL
-Java_com_ibm_oti_reflect_AnnotationHelper_getDefaultReturnValueFromMethod PROTOTYPE((JNIEnv
* env, jclass unusedClazz, jclass clazz, jclass annType, jobject obj));
 
 /* NativesCommonSocketImpl*/
 void JNICALL Java_java_net_SocketImpl_listenStreamSocketImpl PROTOTYPE(( JNIEnv *env, jclass
thisClz, jobject fileDescriptor, jint backlog));
@@ -254,12 +230,6 @@
 jchar JNICALL Java_java_io_ObjectOutputStream_getFieldChar PROTOTYPE((JNIEnv *env, jclass
clazz, jobject targetObject, jobject declaringClass, jobject fieldName));
 
 /* NativesCommonFileInputStream*/
-jint JNICALL Java_com_ibm_oti_connection_file_FileInputStream_readByteImpl PROTOTYPE((JNIEnv
* env, jobject recv, jlong descriptor));
-jint JNICALL Java_com_ibm_oti_connection_file_FileInputStream_readImpl PROTOTYPE((JNIEnv
* env, jobject recv, jbyteArray buffer, jint offset, jint count, jlong descriptor));
-jlong JNICALL Java_com_ibm_oti_connection_file_FileInputStream_skipImpl PROTOTYPE((JNIEnv
* env, jobject recv, jlong count, jlong descriptor));
-jlong JNICALL Java_com_ibm_oti_connection_file_FileInputStream_openImpl PROTOTYPE((JNIEnv
* env, jobject recv, jbyteArray path));
-void JNICALL Java_com_ibm_oti_connection_file_FileInputStream_closeImpl PROTOTYPE((JNIEnv
* env, jobject recv, jlong descriptor));
-jint JNICALL Java_com_ibm_oti_connection_file_FileInputStream_availableImpl PROTOTYPE((JNIEnv
* env, jobject recv, jlong descriptor));
 
 /* NativesCommonSocket*/
 void createSocket PROTOTYPE((JNIEnv* env, jobject thisObjFD, int sockType, jboolean preferIPv4Stack));
@@ -302,12 +272,6 @@
 /* NativesCommonTimeZone*/
 jstring JNICALL Java_java_util_TimeZone_getCustomTimeZone PROTOTYPE((JNIEnv *env, jclass
clazz, jintArray tzinfo, jbooleanArray isCustomTimeZone));
 
-/* NativesCommonFileOutputStream*/
-void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_writeImpl PROTOTYPE((JNIEnv
*env, jobject recv, jbyteArray buffer, jint offset, jint count, jlong descriptor));
-jlong JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_openImpl PROTOTYPE((JNIEnv
* env, jobject recv, jbyteArray path, jboolean append));
-void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_writeByteImpl PROTOTYPE((JNIEnv
*env, jobject recv, jint c, jlong descriptor));
-void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_closeImpl PROTOTYPE((JNIEnv
* env, jobject recv, jlong descriptor));
-
 /* NativesCommonFloatParsing*/
 JNIEXPORT jfloat JNICALL Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl
    PROTOTYPE((JNIEnv *env, jclass clazz, jstring s, jint e));
@@ -363,46 +327,13 @@
 
 /* NativesCommonSocket*/
 void throwSocketException PROTOTYPE((JNIEnv* env, I_32 errorNumber));
-void JNICALL Java_com_ibm_oti_connection_socket_Connection_connectStreamImpl PROTOTYPE((
-	JNIEnv* env, jobject socket, jint localPort, jint remotePort, jbyteArray addr));
-jint JNICALL Java_com_ibm_oti_connection_socket_Connection_sendStreamImpl PROTOTYPE(( JNIEnv
*env, jobject socket, jbyteArray data, jint offset, jint count));
-void JNICALL Java_com_ibm_oti_connection_socket_Connection_connectStreamImpl2 PROTOTYPE((
-	JNIEnv* env, jobject socket, jint localPort, jint remotePort, jbyteArray addr));
-jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_sendDatagramImpl PROTOTYPE((
-	JNIEnv* env, jobject socket, jbyteArray data, jint offset, jint msgLength,
-	jbyteArray addr, jint targetPort));
-jstring JNICALL Java_com_ibm_oti_connection_socket_Socket_getHostByAddrImpl PROTOTYPE((JNIEnv*
env, jclass clazz, jobject addr));
-jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_nominalDatagramImpl PROTOTYPE((
-	JNIEnv* env, jobject socket));
-jobject JNICALL Java_com_ibm_oti_connection_socket_Socket_getHostByNameImpl PROTOTYPE((
-	JNIEnv* env, jclass clazz, jstring aName));
 I_32 conPollSelectRead PROTOTYPE((JNIEnv * env, jobject socket, jint timeout, BOOLEAN poll,
BOOLEAN accept));
-jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_netMaxDatagramImpl PROTOTYPE((
-	JNIEnv* env, jobject recv, jobject datagramSocket));
 void* getSocketDescriptor PROTOTYPE((JNIEnv *env, jobject fd));
-jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_netNominalDatagramImpl PROTOTYPE((
-	JNIEnv* env, jobject recv, jobject datagramSocket));
 void setSocketDescriptor PROTOTYPE((JNIEnv * env, jobject fd, void *value));
-jint JNICALL Java_com_ibm_oti_connection_socket_Socket_getSocketOptionImpl PROTOTYPE((JNIEnv
*env, jobject socket, jint anOption));
 jstring JNICALL Java_java_lang_System_getHostnameImpl PROTOTYPE((
 	JNIEnv* env, jclass clazz));
-void JNICALL Java_com_ibm_oti_connection_socket_Socket_setSocketOptionImpl PROTOTYPE((JNIEnv
*env, jobject socket, jint anOption, jint aValue));
-void JNICALL Java_com_ibm_oti_connection_socket_Socket_socketCloseImpl PROTOTYPE(( JNIEnv
* env, jobject socket));
-jint JNICALL Java_com_ibm_oti_connection_socket_Connection_availableStreamImpl PROTOTYPE((
JNIEnv *env, jobject socket));
 void conUpdateSocket PROTOTYPE((JNIEnv *env, hysockaddr_t sockaddrP, jobject socket, int
remote));
-jint JNICALL Java_com_ibm_oti_connection_socket_Socket_getIPImpl  PROTOTYPE((
-	JNIEnv* env, jclass clazz, jstring aName));
-void JNICALL Java_com_ibm_oti_connection_datagram_Connection_bindDatagramImpl PROTOTYPE((
-	JNIEnv* env, jobject socket, jint localPort));
-jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_maxDatagramImpl PROTOTYPE((
-	JNIEnv* env, jobject socket));
-jint JNICALL Java_com_ibm_oti_connection_socket_Socket_getSocketFlags PROTOTYPE((JNIEnv *env,
jclass thisClz));
-void JNICALL Java_com_ibm_oti_connection_socket_Connection_shutdownSideImpl PROTOTYPE(( JNIEnv
* env, jobject socket, jboolean inputSide));
-jint JNICALL Java_com_ibm_oti_connection_socket_Connection_receiveStreamImpl PROTOTYPE((
JNIEnv *env, jobject socket,
-	jbyteArray data, jint offset, jint count, jint timeout));
 hysocket_t createAndBindSocket PROTOTYPE((JNIEnv* env, jobject socket, int sockType, int
localPort));
-jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_receiveDatagramImpl PROTOTYPE((
JNIEnv *env,
-	jobject socket, jbyteArray data, jint offset, jint msgLength, jint timeout));
 
 /* NativesCommonFileDescriptor*/
 void JNICALL Java_java_io_FileDescriptor_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass
fdClazz));
@@ -425,14 +356,6 @@
 	jobjectArray arg1, jobjectArray arg2, jbyteArray dir));
 void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl PROTOTYPE((JNIEnv
*env, jobject recv, jobject arg1, jlong arg2));
 void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization
PROTOTYPE((JNIEnv * env, jclass clazz));
-
-/* NativesCommonServerSocket*/
-void JNICALL Java_com_ibm_oti_connection_serversocket_Connection_acceptStreamSocketImpl PROTOTYPE((JNIEnv
*env,
-	jobject serversocket, jobject socket, jint timeout));
-void JNICALL Java_com_ibm_oti_connection_serversocket_Connection_listenStreamImpl PROTOTYPE((
-	JNIEnv* env, jobject serversocket, jint localPort, jint backlog));
-void JNICALL Java_com_ibm_oti_connection_serversocket_Connection_acceptStreamSocketImpl2
PROTOTYPE((JNIEnv *env,
-	jobject serversocket, jobject socket, jint timeout));
 
 /* NativesCommonPlainDatagramSocketImpl*/
 jint JNICALL Java_java_net_PlainDatagramSocketImpl_sendDatagramImpl2 PROTOTYPE((

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h?rev=577602&r1=577601&r2=577602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
Thu Sep 20 00:36:53 2007
@@ -24,29 +24,6 @@
 #endif
 #include "vmi.h"
 
-  /* NativesCommonComm*/
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_writeImpl
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle,
-                jbyteArray jBuffer, jint offset, jint length));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_readImpl
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle,
-                jbyteArray jBuffer, jint offset, jint length));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_getBaud
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_comm_Connection_closeImpl
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_openImpl
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint jPortNum));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_setBaud
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle, jint baudrate));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_openImpl2
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jstring portName));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_comm_Connection_configureImpl
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle, jint baudrate,
-                jint bitsPerChar, jint stopBits, jint parity,
-                jboolean autoRTS, jboolean autoCTS, jint timeout));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_comm_Connection_availableImpl
-    PROTOTYPE ((JNIEnv * env, jobject jThis, jint osHandle));
 
   /* NativesCommonPlainServerSocketImpl*/
   JNIEXPORT void JNICALL
@@ -437,21 +414,6 @@
     PROTOTYPE ((JNIEnv * env, jclass clazz, jobject targetObject,
                 jobject declaringClass, jobject fieldName));
                 
-  /* NativesCommonFileInputStream*/
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_file_FileInputStream_readByteImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jlong descriptor));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_file_FileInputStream_readImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset,
-                jint count, jlong descriptor));
-  JNIEXPORT jlong JNICALL Java_com_ibm_oti_connection_file_FileInputStream_skipImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jlong count, jlong descriptor));
-  JNIEXPORT jlong JNICALL Java_com_ibm_oti_connection_file_FileInputStream_openImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray path));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_file_FileInputStream_closeImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jlong descriptor));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_file_FileInputStream_availableImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jlong descriptor));
-    
   /* NativesCommonSocket*/
   void createSocket
     PROTOTYPE ((JNIEnv * env, jobject thisObjFD, int sockType,
@@ -533,18 +495,6 @@
     PROTOTYPE ((JNIEnv * env, jclass clazz, jintArray tzinfo,
                 jbooleanArray isCustomTimeZone));
                 
-  /* NativesCommonFileOutputStream*/
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_writeImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset,
-                jint count, jlong descriptor));
-  JNIEXPORT jlong JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_openImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray path,
-                jboolean append));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_writeByteImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jint c, jlong descriptor));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_closeImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jlong descriptor));
-    
   /* NativesCommonFloatParsing*/
   JNIEXPORT jfloat JNICALL
     Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl
@@ -600,11 +550,6 @@
     PROTOTYPE ((JNIEnv * env, jobject fileDescriptor, hysockaddr_t sockaddrP,
                 jboolean preferIPv6Addresses));
                 
-  /* NativesCommonNativeCharConv*/
-  JNIEXPORT jboolean JNICALL
-    Java_com_ibm_oti_io_NativeCharacterConverter_supportsNativeCharConv
-    PROTOTYPE ((JNIEnv * env, jobject recv));
-    
   /* NativesCommonIoHelpers*/
   void *getJavaIoFileDescriptorContentsAsPointer
     PROTOTYPE ((JNIEnv * env, jobject fd));
@@ -636,73 +581,19 @@
 
   /* NativesCommonSocket*/
   void throwSocketException PROTOTYPE ((JNIEnv * env, I_32 errorNumber));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_socket_Connection_connectStreamImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jint localPort, jint remotePort,
-                jbyteArray addr));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_socket_Connection_sendStreamImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jbyteArray data, jint offset,
-                jint count));
-  JNIEXPORT void JNICALL
-    Java_com_ibm_oti_connection_socket_Connection_connectStreamImpl2
-    PROTOTYPE ((JNIEnv * env, jobject socket, jint localPort, jint remotePort,
-                jbyteArray addr));
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_connection_datagram_Connection_sendDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jbyteArray data, jint offset,
-                jint msgLength, jbyteArray addr, jint targetPort));
-  JNIEXPORT jstring JNICALL Java_com_ibm_oti_connection_socket_Socket_getHostByAddrImpl
-    PROTOTYPE ((JNIEnv * env, jclass clazz, jobject addr));
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_connection_datagram_Connection_nominalDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket));
-  JNIEXPORT jobject JNICALL Java_com_ibm_oti_connection_socket_Socket_getHostByNameImpl
-    PROTOTYPE ((JNIEnv * env, jclass clazz, jstring aName));
   I_32 conPollSelectRead
     PROTOTYPE ((JNIEnv * env, jobject socket, jint timeout, BOOLEAN poll,
                 BOOLEAN accept));
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_connection_datagram_Connection_netMaxDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jobject datagramSocket));
   void *getSocketDescriptor PROTOTYPE ((JNIEnv * env, jobject fd));
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_connection_datagram_Connection_netNominalDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jobject datagramSocket));
   void setSocketDescriptor
     PROTOTYPE ((JNIEnv * env, jobject fd, void *value));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_socket_Socket_getSocketOptionImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jint anOption));
   JNIEXPORT jstring JNICALL Java_java_lang_System_getHostnameImpl
     PROTOTYPE ((JNIEnv * env, jclass clazz));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_socket_Socket_setSocketOptionImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jint anOption, jint aValue));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_socket_Socket_socketCloseImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket));
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_connection_socket_Connection_availableStreamImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket));
   void conUpdateSocket
     PROTOTYPE ((JNIEnv * env, hysockaddr_t sockaddrP, jobject socket,
                 int remote));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_socket_Socket_getIPImpl
-    PROTOTYPE ((JNIEnv * env, jclass clazz, jstring aName));
-  JNIEXPORT void JNICALL
-    Java_com_ibm_oti_connection_datagram_Connection_bindDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jint localPort));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_datagram_Connection_maxDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_socket_Socket_getSocketFlags
-    PROTOTYPE ((JNIEnv * env, jclass thisClz));
-  JNIEXPORT void JNICALL Java_com_ibm_oti_connection_socket_Connection_shutdownSideImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jboolean inputSide));
-  JNIEXPORT jint JNICALL Java_com_ibm_oti_connection_socket_Connection_receiveStreamImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jbyteArray data, jint offset,
-                jint count, jint timeout));
   hysocket_t createAndBindSocket
     PROTOTYPE ((JNIEnv * env, jobject socket, int sockType, int localPort));
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_connection_datagram_Connection_receiveDatagramImpl
-    PROTOTYPE ((JNIEnv * env, jobject socket, jbyteArray data, jint offset,
-                jint msgLength, jint timeout));
                 
   /* NativesCommonFileDescriptor*/
   JNIEXPORT void JNICALL Java_java_io_FileDescriptor_oneTimeInitialization
@@ -745,20 +636,6 @@
   JNIEXPORT void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization
     PROTOTYPE ((JNIEnv * env, jclass clazz));
     
-  /* NativesCommonServerSocket*/
-  JNIEXPORT void JNICALL
-    Java_com_ibm_oti_connection_serversocket_Connection_acceptStreamSocketImpl
-    PROTOTYPE ((JNIEnv * env, jobject serversocket, jobject socket,
-                jint timeout));
-  JNIEXPORT void JNICALL
-    Java_com_ibm_oti_connection_serversocket_Connection_listenStreamImpl
-    PROTOTYPE ((JNIEnv * env, jobject serversocket, jint localPort,
-                jint backlog));
-  JNIEXPORT void JNICALL
-    Java_com_ibm_oti_connection_serversocket_Connection_acceptStreamSocketImpl2
-    PROTOTYPE ((JNIEnv * env, jobject serversocket, jobject socket,
-                jint timeout));
-                
   /* NativesCommonPlainDatagramSocketImpl*/
   JNIEXPORT jint JNICALL Java_java_net_PlainDatagramSocketImpl_sendDatagramImpl2
     PROTOTYPE ((JNIEnv * env, jclass thisClz, jobject fileDescriptor,
@@ -801,24 +678,6 @@
   /************************************************************
   ** COMPONENT: NativesWin32
   ************************************************************/
-  /* NativesWin32CharConv*/
-  JNIEXPORT jint JNICALL
-    Java_com_ibm_oti_io_NativeCharacterConverter_convertStreamBytesToCharsImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray srcBytes,
-                jint srcOffset, jint srcCount, jcharArray dstChars,
-                jint dstOffset, jint dstCount, jintArray stopPos,
-                jstring codePageID, jlong osCodePage));
-  JNIEXPORT jbyteArray JNICALL
-    Java_com_ibm_oti_io_NativeCharacterConverter_convertCharsToBytesImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jcharArray chars, jint offset,
-                jint count, jstring codePageID, jlong osCodePage));
-  JNIEXPORT jboolean JNICALL
-    Java_com_ibm_oti_io_NativeCharacterConverter_supportsCodePage
-    PROTOTYPE ((JNIEnv * env, jobject recv, jstring javaCodePage));
-  JNIEXPORT jcharArray JNICALL
-    Java_com_ibm_oti_io_NativeCharacterConverter_convertBytesToCharsImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray bytes, jint offset,
-                jint count, jstring codePageID, jlong osCodePage));
 
   /* NativesWin32Helpers*/
   int platformReadLink PROTOTYPE ((char *link));

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h?rev=577602&r1=577601&r2=577602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h
Thu Sep 20 00:36:53 2007
@@ -38,7 +38,6 @@
   jfieldID FID_java_net_DatagramPacket_address;
   jfieldID FID_java_net_DatagramPacket_port;
   jfieldID FID_java_lang_ClassLoader_vmRef;
-  jfieldID FID_com_ibm_oti_vm_MemorySpace;
   /* Used by ObjectStreamClass */
   jmethodID MID_java_lang_reflect_Field_getSignature;
   jmethodID MID_java_lang_reflect_Method_getSignature;



Mime
View raw message