Index: src/libserveez/ChangeLog
===================================================================
RCS file: /cvsroot/serveez/serveez/src/libserveez/ChangeLog,v
retrieving revision 1.86
diff -u -p --unified -r1.86 ChangeLog
--- src/libserveez/ChangeLog	5 Dec 2002 16:57:56 -0000	1.86
+++ src/libserveez/ChangeLog	19 Dec 2002 15:08:45 -0000
@@ -1,3 +1,11 @@
+2002-12-19  Andreas Rottmann   <address@hidden>
+
+	* coserver/coserver.c (svz_coserver_start): Initialize
+	coserver->sock (was not initialized on non-MINGW platforms).
+
+	* socket.h (svz_sock_reduce_recv, svz_sock_reduce_send): Macros
+	arguments now correctly bracketed.
+
 2002-12-05  Stefan Jahn  <address@hidden>
 
 	* server.h, server.c, asprintf.h, asprintf.c, cfg.h, cfg.c:
Index: src/libserveez/socket.h
===================================================================
RCS file: /cvsroot/serveez/serveez/src/libserveez/socket.h,v
retrieving revision 1.20
diff -u -p --unified -r1.20 socket.h
--- src/libserveez/socket.h	6 Jun 2002 20:04:51 -0000	1.20
+++ src/libserveez/socket.h	19 Dec 2002 15:08:47 -0000
@@ -274,21 +274,21 @@ __END_DECLS
 /*
  * Shorten the receive buffer of @var{sock} by @var{len} bytes.
  */
-#define svz_sock_reduce_recv(sock, len)                  \
-  if (len && sock->recv_buffer_fill > len) {             \
-    memmove (sock->recv_buffer, sock->recv_buffer + len, \
-             sock->recv_buffer_fill - len);              \
-  }                                                      \
-  sock->recv_buffer_fill -= len;
+#define svz_sock_reduce_recv(sock, len)                        \
+  if ((len) && (sock)->recv_buffer_fill > (len)) {             \
+    memmove ((sock)->recv_buffer, (sock)->recv_buffer + (len), \
+             (sock)->recv_buffer_fill - (len));                \
+  }                                                            \
+  (sock)->recv_buffer_fill -= (len);
 
 /*
  * Reduce the send buffer of @var{sock} by @var{len} bytes.
  */
-#define svz_sock_reduce_send(sock, len)                  \
-  if (len && sock->send_buffer_fill > len) {             \
-    memmove (sock->send_buffer, sock->send_buffer + len, \
-	     sock->send_buffer_fill - len);              \
-  }                                                      \
-  sock->send_buffer_fill -= len;
+#define svz_sock_reduce_send(sock, len)                        \
+  if ((len) && (sock)->send_buffer_fill > (len)) {             \
+    memmove ((sock)->send_buffer, (sock)->send_buffer + (len), \
+	     (sock)->send_buffer_fill - (len));                \
+  }                                                            \
+  (sock)->send_buffer_fill -= (len);
 
 #endif /* not __SOCKET_H__ */
Index: src/libserveez/coserver/coserver.c
===================================================================
RCS file: /cvsroot/serveez/serveez/src/libserveez/coserver/coserver.c,v
retrieving revision 1.29
diff -u -p --unified -r1.29 coserver.c
--- src/libserveez/coserver/coserver.c	15 May 2002 14:00:46 -0000	1.29
+++ src/libserveez/coserver/coserver.c	19 Dec 2002 15:08:48 -0000
@@ -753,7 +753,8 @@ svz_coserver_start (int type) 
   coserver = svz_malloc (sizeof (svz_coserver_t));
   coserver->type = type;
   coserver->busy = 0;
-
+  coserver->sock = NULL;
+  
   if (svz_coservers == NULL)
     svz_coservers = svz_array_create (MAX_COSERVER_TYPES, NULL);
   svz_array_add (svz_coservers, coserver);