fix windows build

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16966 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_profile.c b/src/switch_profile.c
index 056511e76332ab2aec2dcd2433186313cda419e1..7e4e9e532bb83ac58746d97da17d523575ca4a65 100644 (file)
--- a/src/switch_profile.c
+++ b/src/switch_profile.c
@@ -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 @@ SWITCH_DECLARE(int) switch_get_system_idle_time(switch_profile_timer_t *p, doubl
        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;

diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index 1db126677ece75a23e499ab23f16d948a69e5659..4bd5eb7ea59273d13b2a9ee82478fefc7c45bb18 100644 (file)
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -798,6 +798,10 @@
                                RelativePath="..\..\src\switch_pcm.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\switch_profile.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\switch_regex.c"\r
                                >\r