diff -urN cyrus-sasl-2.1.5/config.h.in cyrus-sasl-2.1.5-modified/config.h.in
--- cyrus-sasl-2.1.5/config.h.in	Mon Jun 10 09:54:19 2002
+++ cyrus-sasl-2.1.5-modified/config.h.in	Sat Jul 13 14:50:08 2002
@@ -302,16 +302,16 @@
 
 
 /* Create a struct iovec if we need one */
-#if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H)
+/* #if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H) */
 /* (win32 is handled in sasl.h) */
-struct iovec {
-    char *iov_base;
-    long iov_len;
-};
-#else
+/* struct iovec { */
+/*   char *iov_base; */
+/*   long iov_len; */
+/* }; */
+/* #else */
 #include <sys/types.h>
 #include <sys/uio.h>
-#endif
+/* #endif */
 
 /* location of the random number generator */
 #ifndef DEV_RANDOM
diff -urN cyrus-sasl-2.1.5/saslauthd/saslauthd.h.in cyrus-sasl-2.1.5-modified/saslauthd/saslauthd.h.in
--- cyrus-sasl-2.1.5/saslauthd/saslauthd.h.in	Wed Jun  5 20:44:34 2002
+++ cyrus-sasl-2.1.5-modified/saslauthd/saslauthd.h.in	Sat Jul 13 14:55:28 2002
@@ -186,15 +186,15 @@
 #endif
 
 /* Create a struct iovec if we need one */
-#if !defined(HAVE_SYS_UIO_H)
-struct iovec {
-    long iov_len;
-    char *iov_base;
-};
-#else
+/* #if !defined(HAVE_SYS_UIO_H) */
+/* struct iovec { */
+/*   long iov_len; */
+/*   char *iov_base; */
+/* }; */
+/* #else */
 #include <sys/types.h>
 #include <sys/uio.h>
-#endif
+/* #endif */
 
 #ifndef HAVE_GETADDRINFO
 #define getaddrinfo     sasl_getaddrinfo