Update of /cvsroot/pure-data/externals/unauthorized/mp3live~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19030/mp3live~
Modified Files: mp3fileout~.c mp3streamin~.c mp3streamout~.c Log Message: lots of MinGW fixes for RC6
Index: mp3streamin~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/mp3live~/mp3streamin~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mp3streamin~.c 9 Dec 2005 06:25:59 -0000 1.5 --- mp3streamin~.c 18 Dec 2005 18:55:09 -0000 1.6 *************** *** 41,45 **** #include <sys/types.h> #include <string.h> ! #ifndef WIN32 #include <sys/socket.h> #include <errno.h> --- 41,48 ---- #include <sys/types.h> #include <string.h> ! #ifdef _WIN32 ! #include <io.h> ! #include <winsock.h> ! #else #include <sys/socket.h> #include <errno.h> *************** *** 53,61 **** #include <stdio.h> #define SOCKET_ERROR -1 ! #else ! #include <winsock.h> ! #endif
! #if defined(__APPLE__) || defined(WIN32) #define MSG_NOSIGNAL 0 #define SOL_TCP IPPROTO_TCP --- 56,62 ---- #include <stdio.h> #define SOCKET_ERROR -1 ! #endif /* _WIN32 */
! #if defined(__APPLE__) || defined(_WIN32) #define MSG_NOSIGNAL 0 #define SOL_TCP IPPROTO_TCP
Index: mp3fileout~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/mp3live~/mp3fileout~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mp3fileout~.c 9 Dec 2005 06:25:59 -0000 1.5 --- mp3fileout~.c 18 Dec 2005 18:55:09 -0000 1.6 *************** *** 37,41 **** #include <sys/types.h> #include <string.h> ! #ifdef UNIX #include <sys/socket.h> #include <errno.h> --- 37,45 ---- #include <sys/types.h> #include <string.h> ! #ifdef _WIN32 ! #include <winsock.h> ! #include <io.h> ! #include <fcntl.h> ! #else #include <sys/socket.h> #include <errno.h> *************** *** 49,59 **** #include <stdio.h> #define SOCKET_ERROR -1 ! #else ! #include <winsock.h> ! #include <io.h> ! #include <fcntl.h> ! #endif
! #if defined(__APPLE__) || defined(WIN32) #define MSG_NOSIGNAL 0 #endif --- 53,59 ---- #include <stdio.h> #define SOCKET_ERROR -1 ! #endif /* _WIN32 */
! #if defined(__APPLE__) || defined(_WIN32) #define MSG_NOSIGNAL 0 #endif
Index: mp3streamout~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/mp3live~/mp3streamout~.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mp3streamout~.c 9 Dec 2005 06:25:59 -0000 1.6 --- mp3streamout~.c 18 Dec 2005 18:55:09 -0000 1.7 *************** *** 41,45 **** #endif #include <ctype.h> ! #ifdef UNIX #include <unistd.h> #include <sys/socket.h> --- 41,50 ---- #endif #include <ctype.h> ! #ifdef _WIN32 ! #include <io.h> ! #include <windows.h> ! #include <winsock.h> ! #include <windef.h> ! #else #include <unistd.h> #include <sys/socket.h> *************** *** 49,60 **** #include <sys/time.h> #define SOCKET_ERROR -1 - #else - #include <io.h> - #include <windows.h> - #include <winsock.h> - #include <windef.h> #endif
! #if defined(__APPLE__) || defined(WIN32) #define MSG_NOSIGNAL 0 #endif --- 54,60 ---- #include <sys/time.h> #define SOCKET_ERROR -1 #endif
! #if defined(__APPLE__) || defined(_WIN32) #define MSG_NOSIGNAL 0 #endif