[Freeswitch-svn] [commit] r4247 - freeswitch/trunk/src
Freeswitch SVN
mikej at freeswitch.org
Tue Feb 13 19:31:12 EST 2007
Author: mikej
Date: Tue Feb 13 19:31:11 2007
New Revision: 4247
Modified:
freeswitch/trunk/src/switch_console.c
Log:
use WaitForSingleObject for the console loop to wait on stdin on the windows build, as the select was not working properly.
Modified: freeswitch/trunk/src/switch_console.c
==============================================================================
--- freeswitch/trunk/src/switch_console.c (original)
+++ freeswitch/trunk/src/switch_console.c Tue Feb 13 19:31:11 2007
@@ -199,8 +199,10 @@
while(running) {
uint32_t arg;
+#ifndef _MSC_VER
fd_set rfds, efds;
struct timeval tv = {0, 20000};
+#endif
switch_core_session_ctl(SCSC_CHECK_RUNNING, &arg);
if (!arg) {
@@ -210,13 +212,14 @@
if (activity) {
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "\nfreeswitch@%s> ", hostname);
}
-
#ifdef _MSC_VER
-//Microsofts macros don't pass their own compilers warnings.
-#pragma warning(push)
-#pragma warning(disable: 4127 4389)
-#endif
+ activity = WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE),20);
+ if (activity == 102) {
+ fflush(stdout);
+ continue;
+ }
+#else
FD_ZERO(&rfds);
FD_ZERO(&efds);
FD_SET(fileno(stdin), &rfds);
@@ -225,14 +228,12 @@
break;
}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
if (activity == 0) {
fflush(stdout);
continue;
}
+#endif
+
memset(&cmd, 0, sizeof(cmd));
for (x = 0; x < (sizeof(cmd)-1); x++) {
More information about the Freeswitch-svn
mailing list