diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index 5a50340856315c341dfeaf0f72980d1725a0f7a7..bd574ca443be2834d4dcc4bf43e7c9191c8631ca 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -5,7 +5,7 @@
 \*/
 
 #include "global.h"
-RCSID("$Id: file.c,v 1.121 1998/08/06 23:38:08 grubba Exp $");
+RCSID("$Id: file.c,v 1.122 1998/08/08 13:53:23 grubba Exp $");
 #include "fdlib.h"
 #include "interpret.h"
 #include "svalue.h"
@@ -74,6 +74,15 @@ RCSID("$Id: file.c,v 1.121 1998/08/06 23:38:08 grubba Exp $");
 #include <sys/socketvar.h>
 #endif
 
+/* Fix warning on OSF/1
+ *
+ * NOERROR is defined by both sys/stream.h (-1), and arpa/nameser.h (0),
+ * the latter is included by netdb.h.
+ */
+#ifdef NOERROR
+#undef NOERROR
+#endif /* NOERROR */
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 088e2c8aa614c4a6756be100827de5ed572c13b5..9b48141426480154940502ba7b85186f41de9121 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,12 +1,12 @@
 /*
- * $Id: dumudp.c,v 1.40 1998/08/06 23:51:38 grubba Exp $
+ * $Id: dumudp.c,v 1.41 1998/08/08 13:53:37 grubba Exp $
  */
 
 #include "global.h"
 
 #include "config.h"
 
-RCSID("$Id: dumudp.c,v 1.40 1998/08/06 23:51:38 grubba Exp $");
+RCSID("$Id: dumudp.c,v 1.41 1998/08/08 13:53:37 grubba Exp $");
 #include "fdlib.h"
 #include "interpret.h"
 #include "svalue.h"
@@ -78,6 +78,15 @@ RCSID("$Id: dumudp.c,v 1.40 1998/08/06 23:51:38 grubba Exp $");
 #include <sys/socketvar.h>
 #endif
 
+/* Fix warning on OSF/1
+ *
+ * NOERROR is defined by both sys/stream.h (-1), and arpa/nameser.h (0),
+ * the latter is included by netdb.h.
+ */
+#ifdef NOERROR
+#undef NOERROR
+#endif /* NOERROR */
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
@@ -179,8 +188,8 @@ void udp_read(INT32 args)
 {
   int flags = 0, res=0, fd;
   struct sockaddr_in from;
-  int  fromlen = sizeof(struct sockaddr_in);
   char buffer[UDP_BUFFSIZE];
+  ACCEPT_SIZE_T fromlen = sizeof(struct sockaddr_in);
   
   if(args)
   {