[xiph-cvs] cvs commit: net sock.c sock.h

[Michael Smith]

msmith      02/11/30 21:11:07

  Modified:    .        sock.c sock.h
  Log:
  Fix compilation errors on non-windows platforms.

Revision  Changes    Path
1.9       +2 -2      net/sock.c

Index: sock.c
===================================================================
RCS file: /usr/local/cvsroot/net/sock.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sock.c	23 Nov 2002 15:55:27 -0000	1.8
+++ sock.c	1 Dec 2002 02:11:07 -0000	1.9
@@ -41,8 +41,8 @@
 #define vsnprintf _vsnprintf
 #define EINPROGRESS WSAEINPROGRESS
 #define ENOTSOCK WSAENOTSOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EALREADY WSAEALREADY
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EALREADY WSAEALREADY
 #define socklen_t	int
 #endif
 

<p><p>1.8       +3 -4      net/sock.h

Index: sock.h
===================================================================
RCS file: /usr/local/cvsroot/net/sock.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sock.h	23 Nov 2002 15:55:27 -0000	1.7
+++ sock.h	1 Dec 2002 02:11:07 -0000	1.8
@@ -25,11 +25,10 @@
 
 #ifdef _WIN32
 #include <winsock2.h>
+#include <os.h>
 #else
-#include <unistd.h>
-#endif
-
-#include <os.h>
+#include <unistd.h>
+#endif
 
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.