Revision

16966

Author

mrene

Date

2010-03-10 21:02:47 -0600 (Wed, 10 Mar 2010)

Log Message

fix windows build

Modified Paths

• freeswitch/trunk/src/switch_profile.c
• freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj

Diff

--- freeswitch/trunk/src/switch_profile.c	2010-03-10 23:53:12 UTC (rev 16965)
+++ freeswitch/trunk/src/switch_profile.c	2010-03-11 03:02:47 UTC (rev 16966)
@@ -43,7 +43,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #else
-#define _WIN32_WINNT 0x0501 // To make GetSystemTimes visible in windows.h
+/*already defined 
+#define _WIN32_WINNT 0x0501 // To make GetSystemTimes visible in windows.h*/
 #include <windows.h>
 #endif
 
@@ -201,16 +202,17 @@
 	FILETIME idleTime;
 	FILETIME kernelTime;
 	FILETIME userTime;
+	__int64 i64UserTime, i64KernelTime, i64IdleTime;
   
-	if (!::GetSystemTimes(&idleTime, &kernelTime, &userTime)) {
-		return false;
+	if (!GetSystemTimes(&idleTime, &kernelTime, &userTime)) {
+		return SWITCH_FALSE;
 	}
   
-	__int64 i64UserTime = (__int64)userTime.dwLowDateTime | ((__int64)userTime.dwHighDateTime << 32);
+	i64UserTime = (__int64)userTime.dwLowDateTime | ((__int64)userTime.dwHighDateTime << 32);
 
-	__int64 i64KernelTime = (__int64)kernelTime.dwLowDateTime | ((__int64)kernelTime.dwHighDateTime << 32);
+	i64KernelTime = (__int64)kernelTime.dwLowDateTime | ((__int64)kernelTime.dwHighDateTime << 32);
 
-	__int64 i64IdleTime = (__int64)idleTime.dwLowDateTime | ((__int64)idleTime.dwHighDateTime << 32);
+	i64IdleTime = (__int64)idleTime.dwLowDateTime | ((__int64)idleTime.dwHighDateTime << 32);
 
 	if (p->valid_last_times) {
 		__int64 i64User = i64UserTime - p->i64LastUserTime;

--- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj	2010-03-10 23:53:12 UTC (rev 16965)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj	2010-03-11 03:02:47 UTC (rev 16966)
@@ -799,6 +799,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\switch_profile.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\switch_regex.c"
 				>
 			</File>