Author: gmaruzz Date: Tue Dec 9 04:56:46 2008 New Revision: 10671 Log: skypiax: now ifdeffed on WIN32 for automatic understanding of platform Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj Tue Dec 9 04:56:46 2008 @@ -149,6 +149,10 @@ RelativePath="..\mod_skypiax\mod_skypiax.c" > </File> + <File + RelativePath=".\skypiax.h" + > + </File> </Files> <Globals> </Globals> Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Dec 9 04:56:46 2008 @@ -80,8 +80,8 @@ static switch_status_t channel_kill_channel(switch_core_session_t * session, int sig); -#ifdef WIN32_SKYPIAX -#ifdef __CYGWIN__ +#ifdef WIN32 +#ifdef WIN32 struct AsteriskHandles *win32_AsteriskHandlesSkype; HWND win32_hInit_MainWindowHandle; HINSTANCE win32_hInit_ProcessHandle; @@ -322,9 +322,9 @@ return NULL; } -#endif /* __CYGWIN__ */ +#endif /* WIN32 */ -#endif //WIN32_SKYPIAX +#endif //WIN32 static switch_status_t skypiax_codec(private_t * tech_pvt, int sample_rate, int codec_ms) { @@ -485,7 +485,7 @@ DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32_SKYPIAX +#ifndef WIN32 close(fd); #else closesocket(fd); @@ -495,7 +495,7 @@ } WARNINGA("server (I am it) GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32_SKYPIAX +#ifndef WIN32 close(s); #else closesocket(s); @@ -541,7 +541,7 @@ if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } -#ifndef WIN32_SKYPIAX +#ifndef WIN32 close(s); #else closesocket(s); @@ -597,7 +597,7 @@ } ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32_SKYPIAX +#ifndef WIN32 close(fd); #else closesocket(fd); @@ -606,7 +606,7 @@ } WARNINGA("client (I am it) GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32_SKYPIAX +#ifndef WIN32 close(s); #else closesocket(s); @@ -1029,7 +1029,7 @@ }; #define SKYPE_THREAD -#ifndef WIN32_SKYPIAX +#ifndef WIN32 #ifdef SKYPE_THREAD #define SKYPE_X11_BUF_SIZE 512 @@ -1290,9 +1290,9 @@ } #endif /* SKYPE_THREAD */ -#else // WIN32_SKYPIAX +#else // WIN32 -#endif // WIN32_SKYPIAX +#endif // WIN32 #define CONTROLDEV_THREAD #ifdef CONTROLDEV_THREAD @@ -1301,7 +1301,7 @@ #define WANT_SKYPE_X11 int skypiax_skype_write(struct skypiax_interface *p, char *msg_to_skype) { -#ifdef __CYGWIN__ +#ifdef WIN32 static char acInputRow[1024]; COPYDATASTRUCT oCopyData; @@ -1332,7 +1332,7 @@ return -1; } } -#else /* __CYGWIN__ */ +#else /* WIN32 */ #ifdef WANT_SKYPE_X11 struct AsteriskHandles *AsteriskHandlesAst; @@ -1355,7 +1355,7 @@ return -1; } #endif /* WANT_SKYPE_X11 */ -#endif /* __CYGWIN__ */ +#endif /* WIN32 */ if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Tue Dec 9 04:56:46 2008 @@ -34,18 +34,16 @@ * */ -#undef WIN32_SKYPIAX -#undef __CYGWIN__ +#include <switch.h> -#ifndef WIN32_SKYPIAX +#ifndef WIN32 #include <X11/Xlib.h> #include <X11/Xlibint.h> #include <X11/Xatom.h> -#else //WIN32_SKYPIAX +#else //WIN32 //FIXME include? -#endif //WIN32_SKYPIAX +#endif //WIN32 -#include <switch.h> #define SKYPIAX_SVN_VERSION "SVN 123456" @@ -108,14 +106,14 @@ #define SKYPIAX_MAX_INTERFACES 64 -#ifndef WIN32_SKYPIAX +#ifndef WIN32 struct AsteriskHandles { Window skype_win; Display *disp; Window win; switch_file_t *fdesc[2]; }; -#else //WIN32_SKYPIAX +#else //WIN32 struct AsteriskHandles { HWND win32_hInit_MainWindowHandle; @@ -123,7 +121,7 @@ switch_file_t *fdesc[2]; }; -#endif //WIN32_SKYPIAX +#endif //WIN32 struct skypiax_interface { char interface_id[80];