win32 tweaks

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

diff --git a/src/switch.c b/src/switch.c
index 12774532021aa5a05517267ff243677ae355ef6c..ac5ea635557114ec51a983e5287213dc796a0688 100644 (file)
--- 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 9bf49c0b4cfa2e568a7f1bbd1a319d100b142a33..c1aa794131895ca45799934f04a1509cbb0e9a04 100644 (file)
--- 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 e3d9780e83374c4cd023bc1f63cf73417c92a082..e41584b789532b58b9c30cd5f899f4ea0d4095d4 100644 (file)
--- 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;