[Freeswitch-branches] [commit] r10676 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax

[FreeSWITCH SVN]

Author: gmaruzz
Date: Tue Dec  9 09:33:55 2008
New Revision: 10676

Log:
skypiax: less warnings on windows

Modified:
   freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Tue Dec  9 09:33:55 2008
@@ -1,6 +1,5 @@
 #include "skypiax.h"
 
-
 extern switch_memory_pool_t *skypiax_module_pool;
 extern int option_debug;
 extern switch_core_session_t *global_session;
@@ -16,21 +15,26 @@
                                                           void *obj)
 {
   struct skypiax_interface *p = obj;
-  short in[GG];
   short out[GG / 2];
-  int s, len;
+  int s;
 #ifdef WIN32
+  unsigned int len;
+  unsigned int i;
+  unsigned int a;
+  char in[GG];
   int sin_size;
   unsigned int fd;
 #else
+  int len;
+  int i;
+  int a;
+  short in[GG];
   unsigned int sin_size;
   int fd;
 #endif /* WIN32 */
   struct sockaddr_in my_addr;
   struct sockaddr_in remote_addr;
   int exit = 0;
-  int a;
-  int i;
   unsigned int kill_cli_size;
   short kill_cli_buff[320];
 
@@ -171,15 +175,27 @@
 //void *skypiax_do_tcp_cli_thread(void *data)
 {
   struct skypiax_interface *p = obj;
-  int s, fd, len;
-  short in[NN / 2];
-  short out[NN];
-  unsigned int sin_size;
+  int s;
   struct sockaddr_in my_addr;
   struct sockaddr_in remote_addr;
-  int a;
-  int i;
   unsigned int got;
+#ifdef WIN32
+  unsigned int len;
+  unsigned int i;
+  unsigned int a;
+  char in[NN / 2];
+  char out[NN];
+  int sin_size;
+  unsigned int fd;
+#else
+  int len;
+  int i;
+  int a;
+  short in[NN / 2];
+  short out[NN];
+  unsigned int sin_size;
+  int fd;
+#endif /* WIN32 */
 
   if (option_debug > 10) {
     WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG);
@@ -219,7 +235,11 @@
     while (p->interface_state != SKYPIAX_STATE_DOWN
            && (p->skype_callflow == CALLFLOW_STATUS_INPROGRESS
                || p->skype_callflow == SKYPIAX_STATE_UP)) {
+#ifdef WIN32
+      unsigned int fdselect;
+#else
       int fdselect;
+#endif /* WIN32 */
       int rt;
       fd_set fs;
       struct timeval to;
@@ -918,8 +938,9 @@
   int rt;
   //fd_set fs;
   //struct timeval to;
-  int i, a;
+  int a;
   unsigned int howmany;
+  unsigned int i;
 
   if (option_debug > 100) {
     DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG);