svn commit: r393735 - in /tomcat/connectors/trunk/jni/native/src: os.c ssl.c

[mturk]

Author: mturk
Date: Wed Apr 12 23:41:49 2006
New Revision: 393735

URL: http://svn.apache.org/viewcvs?rev=393735&view=rev
Log:
Use proper castings for thread_current.

Modified:
    tomcat/connectors/trunk/jni/native/src/os.c
    tomcat/connectors/trunk/jni/native/src/ssl.c

Modified: tomcat/connectors/trunk/jni/native/src/os.c
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/os.c?rev=393735&r1=393734&r2=393735&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/os.c (original)
+++ tomcat/connectors/trunk/jni/native/src/os.c Wed Apr 12 23:41:49 2006
@@ -18,7 +18,7 @@
  * @author Mladen Turk
  * @version $Revision$, $Date$
  */
- 
+
 #include "apr.h"
 #include "apr_pools.h"
 #include "apr_portable.h"
@@ -46,5 +46,5 @@
 TCN_IMPLEMENT_CALL(jlong, OS, threadCurrent)(TCN_STDARGS)
 {
     UNREFERENCED_STDARGS;
-    return (jlong)apr_os_thread_current();
+    return (jlong)((unsigned long)apr_os_thread_current());
 }

Modified: tomcat/connectors/trunk/jni/native/src/ssl.c
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/ssl.c?rev=393735&r1=393734&r2=393735&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/ssl.c (original)
+++ tomcat/connectors/trunk/jni/native/src/ssl.c Wed Apr 12 23:41:49 2006
@@ -200,7 +200,7 @@
 
     return psaptr->PSATOLD;
 #else
-    return (unsigned long)((jlong)apr_os_thread_current());
+    return (unsigned long)(apr_os_thread_current());
 #endif
 }
 
@@ -371,7 +371,7 @@
     }
     if (SSLeay() < 0x0090700L) {
         TCN_FREE_CSTRING(engine);
-        return (jint)APR_EINVAL;        
+        return (jint)APR_EINVAL;
     }
     /* We must register the library in full, to ensure our configuration
      * code can successfully test the SSL environment.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]