Modified: freeswitch/trunk/src/switch_profile.c (16975 => 16976)

--- freeswitch/trunk/src/switch_profile.c	2010-03-12 17:25:46 UTC (rev 16975)
+++ freeswitch/trunk/src/switch_profile.c	2010-03-12 17:40:19 UTC (rev 16976)
@@ -42,12 +42,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
-#elif defined (MACOSX) || defined (DARWIN)
-  /* Unsupported */
-#else
-/*already defined 
-#define _WIN32_WINNT 0x0501 // To make GetSystemTimes visible in windows.h*/
-#include <windows.h>
 #endif
 
 struct profile_timer 
@@ -73,12 +67,12 @@
 	/* /proc/stat file descriptor used to retrieve the counters */
 	int procfd;
 	int initd;
-#elif defined (MACOSX) || defined (DARWIN)
-  /* Unsupported */
-#else
+#elif defined (WIN32)  || defined (WIN64)
 	__int64 i64LastUserTime;
 	__int64 i64LastKernelTime;
 	__int64 i64LastIdleTime;
+#else
+  /* Unsupported */
 #endif
 };
 
@@ -136,9 +130,7 @@
 	}
 	return 0;
 }
-#endif
 
-#ifdef __linux__
 SWITCH_DECLARE(int) switch_get_system_idle_time(switch_profile_timer_t *p, double *idle_percentage)
 {
 	unsigned long long user, nice, system, idle, iowait, irq, softirq, steal;
@@ -199,17 +191,10 @@
 	return 0;
 }
 
-#elif defined (MACOSX) || defined (DARWIN)
+#elif defined (WIN32) || defined (WIN64)
 
 SWITCH_DECLARE(int) switch_get_system_idle_time(switch_profile_timer_t *p, double *idle_percentage)
 {
-	return SWITCH_FALSE;
-}
-
-#else
-
-SWITCH_DECLARE(int) switch_get_system_idle_time(switch_profile_timer_t *p, double *idle_percentage)
-{
 	FILETIME idleTime;
 	FILETIME kernelTime;
 	FILETIME userTime;
@@ -245,6 +230,14 @@
 	return 0;
 }
 
+#else
+
+  /* Unsupported */
+SWITCH_DECLARE(int) switch_get_system_idle_time(switch_profile_timer_t *p, double *idle_percentage)
+{
+	return SWITCH_FALSE;
+}
+
 #endif
 
 SWITCH_DECLARE(switch_profile_timer_t *)switch_new_profile_timer(void)