diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index fbd28b639..94cfe6c42 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 30 11:29:18 1997  Mikael Djurfeldt  <mdj@kenneth>
+
+	* coop-defs.h (struct coop_t): Renamed errno --> _errno to prevent
+	errno macro expansion of this field name.  (errno is a C
+	preprocessor macro on some systems.)
+
 1997-11-29  Tim Pierce  <twp@skepsis.com>
 
 	* iselect.c: Doc fix.
diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h
index d39894f6a..dc1513600 100644
--- a/libguile/coop-defs.h
+++ b/libguile/coop-defs.h
@@ -100,7 +100,7 @@ typedef struct coop_t {
   SELECT_TYPE *exceptfds;
   int timeoutp;
   struct timeval wakeup_time;	/* Time to stop sleeping */
-  int errno;
+  int _errno;
   int retval;
 #else
   time_t wakeup_time;    /* Time to stop sleeping */
diff --git a/libguile/iselect.c b/libguile/iselect.c
index 88d3b75d1..921fca3e5 100644
--- a/libguile/iselect.c
+++ b/libguile/iselect.c
@@ -367,7 +367,7 @@ error_revive (void)
   
   while ((t = coop_qget (&coop_global_sleepq)) != NULL)
     {
-      t->errno = errno;
+      t->_errno = errno;
       t->retval = -1;
       coop_qput (&coop_global_runq, t);
     }
@@ -581,7 +581,7 @@ scm_internal_select (int nfds,
     }
 
   if (curr->retval == -1)
-    errno = curr->errno;
+    errno = curr->_errno;
   return curr->retval;
 }