--- httpd-2.0.47-metuxmpm-r4-orig/server/mpm/experimental/metuxmpm/metuxmpm.c	Sun Aug 10 18:59:11 2003
+++ httpd-2.0.47-metuxmpm-r4/server/mpm/experimental/metuxmpm/metuxmpm.c	Sun Aug 10 18:57:00 2003
@@ -140,16 +140,16 @@
 #ifdef MPM_METUXMPM_DEBUG
 
 #define _DBG_REAL(text,par...)		\
-    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "(metuxmpm: pid=%d uid=%d) " text, getpid(), getuid(), ##par)
-#define _DBG(par...)	_DBG_REAL(##par,0)
+    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "(metuxmpm: pid=%d uid=%d) " text, getpid(), getuid(), par)
+#define _DBG(par...)	_DBG_REAL(par,0)
 
 #define _TRACE_CALL_REAL(src,dest,par...)	\
-    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "(metuxmpm: pid=%d uid=%d) " src "(): calling " dest, getpid(), getuid(), ##par)
-#define _TRACE_CALL(par...)	_TRACE_CALL_REAL(##par,0)
+    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "(metuxmpm: pid=%d uid=%d) " src "(): calling " dest, getpid(), getuid(), par)
+#define _TRACE_CALL(par...)	_TRACE_CALL_REAL(par,0)
 
 #define _TRACE_RET_REAL(src,dest,par...)	\
-    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "(metuxmpm: pid=%d uid=%d) " src "(): returned from " dest, getpid(), getuid(), ##par)
-#define _TRACE_RET(par...)	_TRACE_RET_REAL(##par,0)
+    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "(metuxmpm: pid=%d uid=%d) " src "(): returned from " dest, getpid(), getuid(), par)
+#define _TRACE_RET(par...)	_TRACE_RET_REAL(par,0)
 
 #else
 
@@ -764,7 +764,7 @@
 /* Starts a thread as long as we're below max_threads */
 static int start_thread(void)
 {
-#define _FDBG(par...)	_DBG("start_thread(): ", ##par)
+#define _FDBG(par...)	_DBG("start_thread(): " par)
     apr_thread_t *thread;
     int rc;
     int cnt;
@@ -859,7 +859,7 @@
     apr_pool_t *ptrans	/* transaction wide pool */
 )
 {
-#define _FDBG(par...)	_DBG("receive_from_multiplexer(): ", ##par)
+#define _FDBG(par...)	_DBG("receive_from_multiplexer(): " par)
     struct msghdr msg;
     struct cmsghdr *cmsg;
     char headers[HUGE_STRING_LEN];
@@ -888,7 +888,7 @@
 
     msg.msg_name       = NULL;
     msg.msg_namelen    = 0;
-    msg.msg_iov        = &iov;
+    msg.msg_iov        = iov;
     msg.msg_iovlen     = 2;
     msg.msg_control    = cmsg;
     msg.msg_controllen = cmsg->cmsg_len;
@@ -929,7 +929,7 @@
 
 static void *worker_thread_proc(apr_thread_t *thd, void *arg)
 {
-#define _FDBG(par...)	_DBG("worker_thread_proc(): ", ##par)
+#define _FDBG(par...)	_DBG("worker_thread_proc(): " par)
     apr_socket_t *sock;
     apr_pool_t *tpool;      /* Pool for this thread           */
     apr_pool_t *ptrans;     /* Pool for per-transaction stuff */
@@ -1293,7 +1293,7 @@
 /* -- main routine of an child process -- */
 static void child_main(int child_num_arg)
 {
-#define _FDBG(par...)	_DBG("child_main(): ", ##par)
+#define _FDBG(par...)	_DBG("child_main(): " par)
 
     int i;
     apr_status_t rv;
@@ -1473,7 +1473,7 @@
 
 static void perform_child_maintenance(void)
 {
-#define _FDBG(par...)	_DBG("perform_child_maintainance(): ", ##par)
+#define _FDBG(par...)	_DBG("perform_child_maintainance(): " par)
     int i;
     int free_length;
     int free_slots[MAX_SPAWN_RATE];
@@ -1533,7 +1533,7 @@
 
 static void server_main_loop(int remaining_children_to_start)
 {
-#define _FDBG(par...)	_DBG("server_main_loop(): ", ##par)
+#define _FDBG(par...)	_DBG("server_main_loop(): " par)
     apr_exit_why_e exitwhy;
     apr_proc_t pid;
     int child_slot;
@@ -2076,7 +2076,7 @@
 
     msg.msg_name    = NULL;
     msg.msg_namelen = 0;
-    msg.msg_iov     = &iov;
+    msg.msg_iov     = iov;
     msg.msg_iovlen  = 2;
 
     cmsg = apr_palloc(r->pool, sizeof(*cmsg) + sizeof(sock_fd));
@@ -2151,7 +2151,7 @@
 
 static int metuxmpm_post_read(request_rec *r)
 {
-#define _FDBG(par...)	_DBG("metuxmpm_post_read(): ", ##par)
+#define _FDBG(par...)	_DBG("metuxmpm_post_read(): " par)
 
     int thread_num = r->connection->id % thread_limit;
     metuxmpm_server_conf *sconf = metuxmpm_SERVER_CONF(r->server->module_config);