From 73b5fcf641d15019a3d58a302f74c317952fa471 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 20 Sep 2006 20:47:28 +0000 Subject: [PATCH] win32 tweaks git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2767 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch.c | 2 -- src/switch_console.c | 11 ++++++++++- src/switch_core.c | 7 ++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/switch.c b/src/switch.c index 1277453202..ac5ea63555 100644 --- a/src/switch.c +++ b/src/switch.c @@ -233,8 +233,6 @@ int main(int argc, char *argv[]) #ifdef WIN32 FreeConsole(); - snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid()); - shutdown_event = CreateEvent(NULL, FALSE, FALSE, path); #else if ((pid = fork())) { fprintf(stderr, "%d Backgrounding.\n", (int)pid); diff --git a/src/switch_console.c b/src/switch_console.c index 9bf49c0b4c..c1aa794131 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -221,13 +221,22 @@ SWITCH_DECLARE(void) switch_console_loop(void) 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 + FD_ZERO(&rfds); FD_ZERO(&efds); FD_SET(fileno(stdin), &rfds); FD_SET(fileno(stdin), &efds); activity = select(fileno(stdin)+1, &rfds, NULL, &efds, &tv); +#ifdef _MSC_VER +#pragma warning(pop) +#endif if (activity == 0) { fflush(stdout); continue; diff --git a/src/switch_core.c b/src/switch_core.c index e3d9780e83..e41584b789 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -3511,12 +3511,17 @@ SWITCH_DECLARE(int32_t) set_high_priority(void) return 0; } - SWITCH_DECLARE(void) switch_core_runtime_loop(int bg) { +#ifdef WIN32 + HANDLE shutdown_event; + char path[256] = ""; +#endif if (bg) { bg = 0; #ifdef WIN32 + snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid()); + shutdown_event = CreateEvent(NULL, FALSE, FALSE, path); WaitForSingleObject(shutdown_event, INFINITE); #else runtime.running = 1;