mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

* iselect.c (collisionp, gnfds, greadfds, gwritefds, gexceptfds,

Browse source 
rreadfds, rwritefds, rexceptfds): Made static.

	* gc.c (terminating), fports.c (terminating): Renamed
	scm_i_terminating.
This commit is contained in:
Neil Jerram 2002-03-12 21:12:25 +00:00
parent 413d32b658
commit 04a98cff96
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/ChangeLog
View file

@ -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> 2002-03-11 Marius Vollmer <mvo@zagadka.ping.de>
* numbers.c (scm_divide): Adapt code from libstdc++/f2c to void * numbers.c (scm_divide): Adapt code from libstdc++/f2c to void

4
libguile/fports.c
View file

@ -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 /* becomes 1 when process is exiting: normal exception handling won't
work by this time. */ work by this time. */
extern int terminating; extern int scm_i_terminating;
static void static void
fport_flush (SCM port) fport_flush (SCM port)
@ -759,7 +759,7 @@ fport_flush (SCM port)
} }
pt->write_pos = pt->write_buf + remaining; pt->write_pos = pt->write_buf + remaining;
} }
if (terminating) if (scm_i_terminating)
{ {
const char *msg = "Error: could not flush file-descriptor "; const char *msg = "Error: could not flush file-descriptor ";
char buf[11]; char buf[11];

4
libguile/gc.c
View file

@ -2585,7 +2585,7 @@ scm_gc_unregister_roots (SCM *b, unsigned long n)
scm_gc_unregister_root (p); scm_gc_unregister_root (p);
} }
int terminating; int scm_i_terminating;
/* called on process termination. */ /* called on process termination. */
#ifdef HAVE_ATEXIT #ifdef HAVE_ATEXIT
@ -2602,7 +2602,7 @@ cleanup (int status, void *arg)
#endif #endif
#endif #endif
{ {
terminating = 1; scm_i_terminating = 1;
scm_flush_all_ports (); scm_flush_all_ports ();
} }

16
libguile/iselect.c
View file

@ -100,21 +100,21 @@ int scm_I_am_dead;
/* This flag indicates that several threads are waiting on the same /* This flag indicates that several threads are waiting on the same
file descriptor. When this is the case, the common fd sets are file descriptor. When this is the case, the common fd sets are
updated in a more inefficient way. */ updated in a more inefficient way. */
int collisionp; static int collisionp;
/* These are the common fd sets. When new select calls are made, /* These are the common fd sets. When new select calls are made,
those sets are merged into these. */ those sets are merged into these. */
int gnfds; static int gnfds;
SELECT_TYPE greadfds; static SELECT_TYPE greadfds;
SELECT_TYPE gwritefds; static SELECT_TYPE gwritefds;
SELECT_TYPE gexceptfds; static SELECT_TYPE gexceptfds;
/* These are the result sets. They are used when we call OS select. /* 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 We couldn't use the common fd sets above, since that would destroy
them. */ them. */
SELECT_TYPE rreadfds; static SELECT_TYPE rreadfds;
SELECT_TYPE rwritefds; static SELECT_TYPE rwritefds;
SELECT_TYPE rexceptfds; static SELECT_TYPE rexceptfds;
/* Constant timeval struct representing a zero timeout which we use /* Constant timeval struct representing a zero timeout which we use
when polling. */ when polling. */