[PD-cvs] externals/pdogg/oggread~ oggread~.c,1.6,1.7

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals/pdogg/oggread~
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23207/oggread~

Modified Files:
	oggread~.c 
Log Message:
fixes for MinGW

Index: oggread~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/pdogg/oggread~/oggread~.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** oggread~.c	27 Nov 2005 07:11:07 -0000	1.6
--- oggread~.c	12 Dec 2005 06:39:07 -0000	1.7
***************
*** 36,40 ****
  #include <errno.h>
  #include <fcntl.h>
! #ifdef UNIX
  #include <sys/socket.h>
  #include <netinet/in.h>
--- 36,43 ----
  #include <errno.h>
  #include <fcntl.h>
! #ifdef WIN32
! #include <io.h>
! #include <stdlib.h>
! #else
  #include <sys/socket.h>
  #include <netinet/in.h>
***************
*** 45,54 ****
  #include <unistd.h>
  #define SOCKET_ERROR -1
- #else
- #include <io.h>
- #include <stdlib.h>
  #endif
  
! #ifdef NT
  #pragma warning( disable : 4244 )
  #pragma warning( disable : 4305 )
--- 48,54 ----
  #include <unistd.h>
  #define SOCKET_ERROR -1
  #endif
  
! #ifdef _MSC_VER
  #pragma warning( disable : 4244 )
  #pragma warning( disable : 4305 )
***************
*** 291,298 ****
  	}
  		/* open file for reading */
! #ifdef UNIX
!     if((x->x_file = fopen(filename->s_name, "r")) < 0)
! #else
  	if((x->x_file = fopen(filename->s_name, "rb")) < 0)
  #endif
      {
--- 291,298 ----
  	}
  		/* open file for reading */
! #ifdef WIN32
  	if((x->x_file = fopen(filename->s_name, "rb")) < 0)
+ #else
+    if((x->x_file = fopen(filename->s_name, "r")) < 0)
  #endif
      {