diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7048e40ee..1514d719b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-23  Christopher Faylor  <cgf@redhat.com>
+
+	* fork.cc: Change SLOW_PID_REUSE to NO_SLOW_PID_REUSE and invert ifdef
+	sense throughout.
+
 2003-04-22  Christopher Faylor  <cgf@redhat.com>
 
 	* select.cc (fhandler_pipe::ready_for_read): Assure that get_guard is
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index d37f7c337..13c0c7705 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -290,12 +290,12 @@ const NO_COPY char __declspec(dllexport) * const _sys_errlist[]=
 /* ENOTSUP 134 */   "134",
 /* ENOMEDIUM 135 */ "no medium",
 /* ENOSHARE 136 */   "No such host or network path",
-/* ECASECLASH 137 */ "Filename exists with different case"
-/* EILSEQ 138 */ "Illegal byte sequence"
+/* ECASECLASH 137 */ "Filename exists with different case",
+/* EILSEQ 138 */ "Illegal byte sequence",
 /* EOVERFLOW 139 */ "Value too large for defined data type"
 };
 
-extern int const NO_COPY __declspec(dllexport) _sys_nerr = sizeof (_sys_errlist) / sizeof (_sys_errlist[0]);
+int NO_COPY __declspec(dllexport) _sys_nerr = sizeof (_sys_errlist) / sizeof (_sys_errlist[0]);
 };
 
 /* FIXME: Why is strerror() a long switch and not just:
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 45664ad6d..2435d95e3 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -325,11 +325,11 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls)
   return 0;
 }
 
-#ifdef SLOW_PID_REUSE
+#ifndef NO_SLOW_PID_REUSE
 static void
 slow_pid_reuse (HANDLE h)
 {
-  static NO_COPY HANDLE last_fork_procs[8] = {0};
+  static NO_COPY HANDLE last_fork_procs[4] = {0};
   static NO_COPY unsigned nfork_procs = 0;
 
   if (nfork_procs >= (sizeof (last_fork_procs) / sizeof (last_fork_procs [0])))
@@ -538,7 +538,7 @@ fork_parent (HANDLE& hParent, dll *&first_dll,
       goto cleanup;
     }
 
-#ifdef SLOW_PID_REUSE
+#ifndef NO_SLOW_PID_REUSE
   slow_pid_reuse (pi.hProcess);
 #endif