NetBSD compilation fixes

[Bang Jun-Young]

ChangeLog:

	* dlls/wsock32/protocol.c:
	Bang Jun-Young <junyoung at mogua.com>
	Rearrange some headers to avoid compile error.

	* dlls/wsock32/socket.c:
	Bang Jun-Young <junyoung at mogua.com>
	Include sys/socket.h if it's available.

	* server/trace.c:
	Bang Jun-Young <junyoung at mogua.com>
	NetBSD needs USE_WS_PREFIX to compile.

-- 
Bang Jun-Young <junyoung at mogua.com>

-------------- next part --------------
Index: dlls/wsock32/protocol.c
===================================================================
RCS file: /home/wine/wine/dlls/wsock32/protocol.c,v
retrieving revision 1.7
diff -u -r1.7 protocol.c
--- dlls/wsock32/protocol.c	2001/11/14 21:26:23	1.7
+++ dlls/wsock32/protocol.c	2001/11/18 13:27:09
@@ -11,12 +11,13 @@
 
 #include "config.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 
 #include "winbase.h"
 #include "winnls.h"
Index: dlls/wsock32/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/wsock32/socket.c,v
retrieving revision 1.16
diff -u -r1.16 socket.c
--- dlls/wsock32/socket.c	2001/11/14 21:26:23	1.16
+++ dlls/wsock32/socket.c	2001/11/18 13:27:13
@@ -42,6 +42,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_SOCKIO_H
 # include <sys/sockio.h>
 #endif
Index: server/trace.c
===================================================================
RCS file: /home/wine/wine/server/trace.c,v
retrieving revision 1.114
diff -u -r1.114 trace.c
--- server/trace.c	2001/11/13 22:23:48	1.114
+++ server/trace.c	2001/11/18 13:27:31
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
+#define USE_WS_PREFIX
 #include "winsock2.h"
 #include "winnt.h"
 #include "winbase.h"