svn commit: r583774 - in /harmony/enhanced/classlib/trunk/modules/luni/src/main/native: include/shared/iohelp.h include/unix/jclprots.h include/windows/jclprots.h luni/shared/nethelp.h

[hi...@apache.org]

Author: hindessm
Date: Thu Oct 11 04:24:08 2007
New Revision: 583774

URL: http://svn.apache.org/viewvc?rev=583774&view=rev
Log:
Move the prototypes for the code I moved and remove the prototypes from
jclprots.h - they are only used in luni so might as well stop advertising
them to everyone.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
    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/nethelp.h

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h?rev=583774&r1=583773&r2=583774&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h Thu Oct 11 04:24:08 2007
@@ -24,11 +24,5 @@
 /* DIR_SEPARATOR is defined in hycomp.h */
 #define jclSeparator DIR_SEPARATOR
 void ioh_convertToPlatform (char *path);
-void ioh_writebytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
-                         jint offset, jint count, IDATA descriptor);
-char *ioLookupErrorString (JNIEnv * env, I_32 anErrorNum);
-jint ioh_readbytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
-                        jint offset, jint count, IDATA descriptor);
-void new_ioh_close (JNIEnv * env, jobject recv, jfieldID fdFID);
 
 #endif /* iohelp_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=583774&r1=583773&r2=583774&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 Oct 11 04:24:08 2007
@@ -314,10 +314,6 @@
 void throwJavaIoIOExceptionClosed PROTOTYPE((JNIEnv* env));
 void ioh_convertToPlatform PROTOTYPE((char *path));
 void throwNPException PROTOTYPE((JNIEnv* env, const char* message));
-void ioh_writebytesImpl PROTOTYPE((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint count, IDATA descriptor));
-char* ioLookupErrorString PROTOTYPE((JNIEnv* env, I_32 anErrorNum));
-jint ioh_readbytesImpl PROTOTYPE((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint count, IDATA descriptor));
-void new_ioh_close PROTOTYPE((JNIEnv * env, jobject recv, jfieldID fdFID));
 void throwIndexOutOfBoundsException PROTOTYPE((JNIEnv* env));
 
 /* NativesCommonSocket*/

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=583774&r1=583773&r2=583774&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 Oct 11 04:24:08 2007
@@ -559,14 +559,6 @@
   void throwJavaIoIOExceptionClosed PROTOTYPE ((JNIEnv* env));
   void ioh_convertToPlatform PROTOTYPE ((char *path));
   void throwNPException PROTOTYPE ((JNIEnv* env, const char* message));
-  void ioh_writebytesImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset,
-                jint count, IDATA descriptor));
-  char *ioLookupErrorString PROTOTYPE ((JNIEnv * env, I_32 anErrorNum));
-  jint ioh_readbytesImpl
-    PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset,
-                jint count, IDATA descriptor));
-  void new_ioh_close PROTOTYPE ((JNIEnv * env, jobject recv, jfieldID fdFID));
   void throwIndexOutOfBoundsException PROTOTYPE ((JNIEnv* env));
 
   /* NativesCommonSocket*/

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h?rev=583774&r1=583773&r2=583774&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h Thu Oct 11 04:24:08 2007
@@ -101,4 +101,11 @@
 
 void setSocketLocalAddressContent(JNIEnv * env, jclass channel_class, jobject channel_object,jbyte * address);
 
+jint ioh_readbytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
+                        jint offset, jint count, IDATA descriptor);
+void ioh_writebytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
+                         jint offset, jint count, IDATA descriptor);
+void new_ioh_close (JNIEnv * env, jobject recv, jfieldID fdFID);
+char *ioLookupErrorString (JNIEnv * env, I_32 anErrorNum);
+
 #endif /* nethelp_h */