You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2009/09/16 15:24:55 UTC
svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./
java/org/apache/tomcat/jni/
Author: rjung
Date: Wed Sep 16 13:24:54 2009
New Revision: 815768
URL: http://svn.apache.org/viewvc?rev=815768&view=rev
Log:
Sync java parts of tcnative with C part.
Modified:
tomcat/native/branches/1.1.x/STATUS.txt
tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java
tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java
tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java
tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java
tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java
tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java
Modified: tomcat/native/branches/1.1.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/STATUS.txt (original)
+++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 13:24:54 2009
@@ -30,18 +30,3 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-
-* Backport remaining parts of
- http://svn.eu.apache.org/viewvc?view=rev&revision=730523
- I separated the non typo parts at
- http://people.apache.org/~rjung/patches/jni.patch
- +1: rjung
- -1:
-
-* Sync native and Java methods. Patch available at
- http://people.apache.org/~rjung/patches/tcnative-sync.patch
- Partial backport of
- http://svn.apache.org/viewvc?view=rev&revision=730523
- +1: rjung, mturk
- 0:
- -1:
Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java Wed Sep 16 13:24:54 2009
@@ -32,7 +32,7 @@
* @param size The amount of memory to allocate
* @return The ByteBuffer with allocated memory
*/
- public static native ByteBuffer alloc(int size);
+ public static native ByteBuffer malloc(int size);
/**
* Allocate a new ByteBuffer from memory and set all of the memory to 0
@@ -86,6 +86,6 @@
* Returns the allocated memory size of the ByteBuffer.
* @param buf Previously allocated ByteBuffer.
*/
- public static native int size(ByteBuffer buf);
+ public static native long size(ByteBuffer buf);
}
Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java Wed Sep 16 13:24:54 2009
@@ -693,6 +693,16 @@
public static native int stat(FileInfo finfo, String fname, int wanted, long pool);
/**
+ * Get the specified file's stats. The file is specified by filename,
+ * instead of using a pre-opened file.
+ * @param fname The name of the file to stat.
+ * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
+ * @param pool the pool to use to allocate the new file.
+ * @return FileInfo object.
+ */
+ public static native FileInfo getStat(String fname, int wanted, long pool);
+
+ /**
* Get the specified file's stats.
* @param finfo Where to store the information about the file.
* @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
@@ -700,4 +710,13 @@
*/
public static native int infoGet(FileInfo finfo, int wanted, long thefile);
+
+ /**
+ * Get the specified file's stats.
+ * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
+ * @param thefile The file to get information about.
+ * @return FileInfo object.
+ */
+ public static native FileInfo getInfo(int wanted, long thefile);
+
}
Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 13:24:54 2009
@@ -156,7 +156,7 @@
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
- public static native int setValueJ(long key, String name, int val);
+ public static native int setValueJ(long key, String name, long val);
/**
* Set the Registry value for REG_SZ
Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java Wed Sep 16 13:24:54 2009
@@ -226,6 +226,13 @@
throws Exception;
/**
+ * Set file for randomness
+ * @param ctx Server or Client context to use.
+ * @param file random file.
+ */
+ public static native void setRandom(long ctx, String file);
+
+ /**
* Set SSL connection shutdown type
* <br />
* The following levels are available for level:
Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 13:24:54 2009
@@ -170,6 +170,16 @@
* made the connection request. This is the socket which should
* be used for all future communication.
*/
+ public static native long acceptx(long sock, long pool)
+ throws Exception;
+
+ /**
+ * Accept a new connection request
+ * @param sock The socket we are listening on.
+ * @return A copy of the socket that is connected to the socket that
+ * made the connection request. This is the socket which should
+ * be used for all future communication.
+ */
public static native long accept(long sock)
throws Exception;
Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java?rev=815768&r1=815767&r2=815768&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java Wed Sep 16 13:24:54 2009
@@ -67,7 +67,7 @@
* @param num Number of elements.
* @param sz Length in bytes of each element.
*/
- public static native long calloc(long num, int sz);
+ public static native long calloc(int num, int sz);
/**
* Deallocates or frees a memory block.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: How should we handle the Java files for native?
Posted by Rainer Jung <ra...@kippdata.de>.
On 16.09.2009 20:58, Mladen Turk wrote:
> On 16/09/09 18:53, Rainer Jung wrote:
>> If we want to get every Java related file for jni from Tomcat, we would
>> need to add the test and examples files back.
>>
>> build.xml and build.properties.default might make more sense in native
>> itself.
>>
>> Comments?
>>
>
> Sure, we should bring back java/examples and java/test
> The sources do not overlap with Tomcat sources.
> build.xml and properties should be brought back as well.
> They are usable for standalone builds.
>
> However we should probably create two source packages
> one with jni code only and one with jni + java (eg. src-all)
> for third-party users outside tomcat.
>
> OTOH one can easily get those files directly from tomcat source.
> But then again, which tomcat src matches which tomcat-native
> src mess would arise.
> So IMO having two source packages should make less trouble.
examples, test and build.* are back and hopefully somewhat improved.
I added "ant download" to native trunk, which retrieves the TC 6 sources
for the version defined in build.properties(.default).
"ant compile" then copies over the needed package.
One can also fake the downloaded Tomcat sources by setting tomcat.src to
the source directory (e.g. when the TC release including Java changes
waits for the native release including native changes, so there's no
correct Tomcat source download yet available).
I didn't yet add the two distributions option to the jnirelease.sh.
I also added two proposals to clean up the TC 5.5 jni copy to the TC 5.5
status file.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: How should we handle the Java files for native?
Posted by Mladen Turk <mt...@apache.org>.
On 16/09/09 18:53, Rainer Jung wrote:
> If we want to get every Java related file for jni from Tomcat, we would
> need to add the test and examples files back.
>
> build.xml and build.properties.default might make more sense in native
> itself.
>
> Comments?
>
Sure, we should bring back java/examples and java/test
The sources do not overlap with Tomcat sources.
build.xml and properties should be brought back as well.
They are usable for standalone builds.
However we should probably create two source packages
one with jni code only and one with jni + java (eg. src-all)
for third-party users outside tomcat.
OTOH one can easily get those files directly from tomcat source.
But then again, which tomcat src matches which tomcat-native
src mess would arise.
So IMO having two source packages should make less trouble.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: How should we handle the Java files for native?
Posted by jean-frederic clere <jf...@gmail.com>.
On 09/16/2009 06:53 PM, Rainer Jung wrote:
> On 16.09.2009 17:24, Mladen Turk wrote:
>> On 16/09/09 16:18, Mark Thomas wrote:
>>> rjung@apache.org wrote:
>>>> Author: rjung
>>>> Date: Wed Sep 16 13:24:54 2009
>>>> New Revision: 815768
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=815768&view=rev
>>>> Log:
>>>> Sync java parts of tcnative with C part.
>>>
>>> Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have
>>> their own copies.
>>>
>>
>> Yes, we need the java part as well, at least for
>> the tomcat-native-xxx.src. Not sure how Apache Mina
>> folks build their suff with tomcat native but I
>> suppose by using the source archive.
>>
>> However we can modify the dist script to
>> pull the java part from the 6.0.x branch so it doesn't
>> have to be duplicated.
>
> Hmmm, how are users support to build? Until recently we were using a
> build.xml. If we don't include the sources, ant would need to retrieve
> them either via svn (for that you need an additional ant library), or
> by downloading a tomcat src distribution.
>
> So I guess the latter is the suggested way of doing it.
>
> Furthermore, there were three directories with Java classes for jni:
> java, test and examples. Only java made it into the TC 6 sources. The
> other two dirs are gone. They are still available in the TC 4.1 and 5.5
> sources though.
>
> If we want to get every Java related file for jni from Tomcat, we would
> need to add the test and examples files back.
+1
Cheers
Jean-Frederic
>
> build.xml and build.properties.default might make more sense in native
> itself.
>
> Comments?
>
> Regards,
>
> Rainer
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
How should we handle the Java files for native?
Posted by Rainer Jung <ra...@kippdata.de>.
On 16.09.2009 17:24, Mladen Turk wrote:
> On 16/09/09 16:18, Mark Thomas wrote:
>> rjung@apache.org wrote:
>>> Author: rjung
>>> Date: Wed Sep 16 13:24:54 2009
>>> New Revision: 815768
>>>
>>> URL: http://svn.apache.org/viewvc?rev=815768&view=rev
>>> Log:
>>> Sync java parts of tcnative with C part.
>>
>> Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have
>> their own copies.
>>
>
> Yes, we need the java part as well, at least for
> the tomcat-native-xxx.src. Not sure how Apache Mina
> folks build their suff with tomcat native but I
> suppose by using the source archive.
>
> However we can modify the dist script to
> pull the java part from the 6.0.x branch so it doesn't
> have to be duplicated.
Hmmm, how are users support to build? Until recently we were using a
build.xml. If we don't include the sources, ant would need to retrieve
them either via svn (for that you need an additional ant library), or
by downloading a tomcat src distribution.
So I guess the latter is the suggested way of doing it.
Furthermore, there were three directories with Java classes for jni:
java, test and examples. Only java made it into the TC 6 sources. The
other two dirs are gone. They are still available in the TC 4.1 and 5.5
sources though.
If we want to get every Java related file for jni from Tomcat, we would
need to add the test and examples files back.
build.xml and build.properties.default might make more sense in native
itself.
Comments?
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
Posted by Mladen Turk <mt...@apache.org>.
On 16/09/09 16:18, Mark Thomas wrote:
> rjung@apache.org wrote:
>> Author: rjung
>> Date: Wed Sep 16 13:24:54 2009
>> New Revision: 815768
>>
>> URL: http://svn.apache.org/viewvc?rev=815768&view=rev
>> Log:
>> Sync java parts of tcnative with C part.
>
> Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have
> their own copies.
>
Yes, we need the java part as well, at least for
the tomcat-native-xxx.src. Not sure how Apache Mina
folks build their suff with tomcat native but I
suppose by using the source archive.
However we can modify the dist script to
pull the java part from the 6.0.x branch so it doesn't
have to be duplicated.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
Posted by Rainer Jung <ra...@kippdata.de>.
On 16.09.2009 16:18, Mark Thomas wrote:
> rjung@apache.org wrote:
>> Author: rjung
>> Date: Wed Sep 16 13:24:54 2009
>> New Revision: 815768
>>
>> URL: http://svn.apache.org/viewvc?rev=815768&view=rev
>> Log:
>> Sync java parts of tcnative with C part.
>
> Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have
> their own copies.
I actually don't know. I didn't check how the build process works.
Mladen? Jean-Frederic?
Note that I also added a backport proposal to the TC 6 copy.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
Posted by Mark Thomas <ma...@apache.org>.
rjung@apache.org wrote:
> Author: rjung
> Date: Wed Sep 16 13:24:54 2009
> New Revision: 815768
>
> URL: http://svn.apache.org/viewvc?rev=815768&view=rev
> Log:
> Sync java parts of tcnative with C part.
Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have
their own copies.
Mark
>
> Modified:
> tomcat/native/branches/1.1.x/STATUS.txt
> tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java
> tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java
> tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java
> tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java
> tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java
> tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java
>
> Modified: tomcat/native/branches/1.1.x/STATUS.txt
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/STATUS.txt (original)
> +++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 13:24:54 2009
> @@ -30,18 +30,3 @@
>
> PATCHES PROPOSED TO BACKPORT:
> [ New proposals should be added at the end of the list ]
> -
> -* Backport remaining parts of
> - http://svn.eu.apache.org/viewvc?view=rev&revision=730523
> - I separated the non typo parts at
> - http://people.apache.org/~rjung/patches/jni.patch
> - +1: rjung
> - -1:
> -
> -* Sync native and Java methods. Patch available at
> - http://people.apache.org/~rjung/patches/tcnative-sync.patch
> - Partial backport of
> - http://svn.apache.org/viewvc?view=rev&revision=730523
> - +1: rjung, mturk
> - 0:
> - -1:
>
> Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java (original)
> +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java Wed Sep 16 13:24:54 2009
> @@ -32,7 +32,7 @@
> * @param size The amount of memory to allocate
> * @return The ByteBuffer with allocated memory
> */
> - public static native ByteBuffer alloc(int size);
> + public static native ByteBuffer malloc(int size);
>
> /**
> * Allocate a new ByteBuffer from memory and set all of the memory to 0
> @@ -86,6 +86,6 @@
> * Returns the allocated memory size of the ByteBuffer.
> * @param buf Previously allocated ByteBuffer.
> */
> - public static native int size(ByteBuffer buf);
> + public static native long size(ByteBuffer buf);
>
> }
>
> Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java (original)
> +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java Wed Sep 16 13:24:54 2009
> @@ -693,6 +693,16 @@
> public static native int stat(FileInfo finfo, String fname, int wanted, long pool);
>
> /**
> + * Get the specified file's stats. The file is specified by filename,
> + * instead of using a pre-opened file.
> + * @param fname The name of the file to stat.
> + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
> + * @param pool the pool to use to allocate the new file.
> + * @return FileInfo object.
> + */
> + public static native FileInfo getStat(String fname, int wanted, long pool);
> +
> + /**
> * Get the specified file's stats.
> * @param finfo Where to store the information about the file.
> * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
> @@ -700,4 +710,13 @@
> */
> public static native int infoGet(FileInfo finfo, int wanted, long thefile);
>
> +
> + /**
> + * Get the specified file's stats.
> + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
> + * @param thefile The file to get information about.
> + * @return FileInfo object.
> + */
> + public static native FileInfo getInfo(int wanted, long thefile);
> +
> }
>
> Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java (original)
> +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 13:24:54 2009
> @@ -156,7 +156,7 @@
> * @param val The the value to set
> * @return If the function succeeds, the return value is 0
> */
> - public static native int setValueJ(long key, String name, int val);
> + public static native int setValueJ(long key, String name, long val);
>
> /**
> * Set the Registry value for REG_SZ
>
> Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java (original)
> +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java Wed Sep 16 13:24:54 2009
> @@ -226,6 +226,13 @@
> throws Exception;
>
> /**
> + * Set file for randomness
> + * @param ctx Server or Client context to use.
> + * @param file random file.
> + */
> + public static native void setRandom(long ctx, String file);
> +
> + /**
> * Set SSL connection shutdown type
> * <br />
> * The following levels are available for level:
>
> Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java (original)
> +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 13:24:54 2009
> @@ -170,6 +170,16 @@
> * made the connection request. This is the socket which should
> * be used for all future communication.
> */
> + public static native long acceptx(long sock, long pool)
> + throws Exception;
> +
> + /**
> + * Accept a new connection request
> + * @param sock The socket we are listening on.
> + * @return A copy of the socket that is connected to the socket that
> + * made the connection request. This is the socket which should
> + * be used for all future communication.
> + */
> public static native long accept(long sock)
> throws Exception;
>
>
> Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java
> URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java?rev=815768&r1=815767&r2=815768&view=diff
> ==============================================================================
> --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java (original)
> +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java Wed Sep 16 13:24:54 2009
> @@ -67,7 +67,7 @@
> * @param num Number of elements.
> * @param sz Length in bytes of each element.
> */
> - public static native long calloc(long num, int sz);
> + public static native long calloc(int num, int sz);
>
> /**
> * Deallocates or frees a memory block.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org