--- file_io/unix/dir.c.jkj	2002-12-14 02:28:13.000000000 -0800
+++ file_io/unix/dir.c	2002-12-14 02:34:18.000000000 -0800
@@ -140,7 +140,9 @@
     return apr_pool_cleanup_run(thedir->pool, thedir, dir_cleanup);
 }
 
-apr_filetype_e apr_filetype_from_dirent_type(int type)
+#ifdef DIRENT_TYPE
+static apr_filetype_e
+apr_filetype_from_dirent_type(int type)
 {
     switch (type) {
     case DT_REG:
@@ -165,7 +167,7 @@
         return APR_UNKFILE;
     }
 }
-
+#endif
 
 apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
                           apr_dir_t *thedir)
--- misc/unix/rand.c.jkj	2002-12-14 02:30:17.000000000 -0800
+++ misc/unix/rand.c	2002-12-14 02:31:06.000000000 -0800
@@ -74,6 +74,10 @@
 #include <sys/un.h>
 #endif
 
+#ifndef SHUT_RDWR
+#define SHUT_RDWR	2
+#endif
+
 #if APR_HAS_RANDOM
 
 APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf,