Author: mturk
Date: Fri Apr 14 01:03:35 2006
New Revision: 394043
URL: http://svn.apache.org/viewcvs?rev=394043&view=rev
Log:
Fix compile warnings on WIN64 flatform
Modified:
tomcat/connectors/trunk/jni/native/os/win32/system.c
Modified: tomcat/connectors/trunk/jni/native/os/win32/system.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/os/win32/system.c?rev=394043&r1=394042&r2=394043&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/os/win32/system.c (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/system.c Fri Apr 14 01:03:35
2006
@@ -310,9 +310,9 @@
if (fnGetSystemTimes) {
if ((*fnGetSystemTimes)(&ft[0], &ft[1], &ft[2])) {
- st[0] = ((ft[0].dwHighDateTime << 32) | ft[0].dwLowDateTime) / 10;
- st[1] = ((ft[1].dwHighDateTime << 32) | ft[1].dwLowDateTime) / 10;
- st[2] = ((ft[2].dwHighDateTime << 32) | ft[2].dwLowDateTime) / 10;
+ st[0] = (((ULONGLONG)ft[0].dwHighDateTime << 32) |
ft[0].dwLowDateTime) / 10;
+ st[1] = (((ULONGLONG)ft[1].dwHighDateTime << 32) |
ft[1].dwLowDateTime) / 10;
+ st[2] = (((ULONGLONG)ft[2].dwHighDateTime << 32) |
ft[2].dwLowDateTime) / 10;
}
else
goto cleanup;
@@ -341,8 +341,8 @@
memset(st, 0, sizeof(st));
if (GetProcessTimes(GetCurrentProcess(), &ft[0], &ft[1], &ft[2], &ft[3])) {
FileTimeToAprTime((apr_time_t *)&st[0], &ft[0]);
- st[1] = ((ft[2].dwHighDateTime << 32) | ft[2].dwLowDateTime) / 10;
- st[2] = ((ft[3].dwHighDateTime << 32) | ft[3].dwLowDateTime) / 10;
+ st[1] = (((ULONGLONG)ft[2].dwHighDateTime << 32) |
ft[2].dwLowDateTime) / 10;
+ st[2] = (((ULONGLONG)ft[3].dwHighDateTime << 32) |
ft[3].dwLowDateTime) / 10;
}
pvals[10] = st[0];
pvals[11] = st[1];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
