summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2002-03-12 21:12:25 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2002-03-12 21:12:25 +0000
commit04a98cff96351d0e3dd47a201592d84ba3edd688 (patch)
tree7b27c0aae65c4a394a53261a9f4c83d87b55d475
parent413d32b658ced090c4d068863e29948b79243bd6 (diff)
downloadguile-04a98cff96351d0e3dd47a201592d84ba3edd688.tar.gz
* iselect.c (collisionp, gnfds, greadfds, gwritefds, gexceptfds,
rreadfds, rwritefds, rexceptfds): Made static. * gc.c (terminating), fports.c (terminating): Renamed scm_i_terminating.
-rw-r--r--libguile/ChangeLog8
-rw-r--r--libguile/fports.c4
-rw-r--r--libguile/gc.c4
-rw-r--r--libguile/iselect.c16
4 files changed, 20 insertions, 12 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 812415ad4..2adb13d62 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-12 Neil Jerram <neil@ossau.uklinux.net>
+
+ * iselect.c (collisionp, gnfds, greadfds, gwritefds, gexceptfds,
+ rreadfds, rwritefds, rexceptfds): Made static.
+
+ * gc.c (terminating), fports.c (terminating): Renamed
+ scm_i_terminating.
+
2002-03-11 Marius Vollmer <mvo@zagadka.ping.de>
* numbers.c (scm_divide): Adapt code from libstdc++/f2c to void
diff --git a/libguile/fports.c b/libguile/fports.c
index 2fe0bee0c..55f4782a3 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -727,7 +727,7 @@ fport_write (SCM port, const void *data, size_t size)
/* becomes 1 when process is exiting: normal exception handling won't
work by this time. */
-extern int terminating;
+extern int scm_i_terminating;
static void
fport_flush (SCM port)
@@ -759,7 +759,7 @@ fport_flush (SCM port)
}
pt->write_pos = pt->write_buf + remaining;
}
- if (terminating)
+ if (scm_i_terminating)
{
const char *msg = "Error: could not flush file-descriptor ";
char buf[11];
diff --git a/libguile/gc.c b/libguile/gc.c
index 3da2861e1..a96e9df9c 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -2585,7 +2585,7 @@ scm_gc_unregister_roots (SCM *b, unsigned long n)
scm_gc_unregister_root (p);
}
-int terminating;
+int scm_i_terminating;
/* called on process termination. */
#ifdef HAVE_ATEXIT
@@ -2602,7 +2602,7 @@ cleanup (int status, void *arg)
#endif
#endif
{
- terminating = 1;
+ scm_i_terminating = 1;
scm_flush_all_ports ();
}
diff --git a/libguile/iselect.c b/libguile/iselect.c
index 2024f15f3..215258001 100644
--- a/libguile/iselect.c
+++ b/libguile/iselect.c
@@ -100,21 +100,21 @@ int scm_I_am_dead;
/* This flag indicates that several threads are waiting on the same
file descriptor. When this is the case, the common fd sets are
updated in a more inefficient way. */
-int collisionp;
+static int collisionp;
/* These are the common fd sets. When new select calls are made,
those sets are merged into these. */
-int gnfds;
-SELECT_TYPE greadfds;
-SELECT_TYPE gwritefds;
-SELECT_TYPE gexceptfds;
+static int gnfds;
+static SELECT_TYPE greadfds;
+static SELECT_TYPE gwritefds;
+static SELECT_TYPE gexceptfds;
/* These are the result sets. They are used when we call OS select.
We couldn't use the common fd sets above, since that would destroy
them. */
-SELECT_TYPE rreadfds;
-SELECT_TYPE rwritefds;
-SELECT_TYPE rexceptfds;
+static SELECT_TYPE rreadfds;
+static SELECT_TYPE rwritefds;
+static SELECT_TYPE rexceptfds;
/* Constant timeval struct representing a zero timeout which we use
when polling. */