diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libio/genops.c | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e676774686..e26dab147c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-01-28 Ulrich Drepper <drepper@cygnus.com> + * libio/genops.c (_IO_un_link, _IO_link_in): Don't use locking if + _IO_MTSAFE_IO is not defined. + * iconv/gconv_db.c (free_modules_db): Don't free memory of internal modules. diff --git a/libio/genops.c b/libio/genops.c index 85d42face4..f925b0d87b 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -31,7 +31,9 @@ #endif #include <string.h> +#ifdef _IO_MTSAFE_IO static _IO_lock_t list_all_lock = _IO_lock_initializer; +#endif void _IO_un_link (fp) @@ -39,8 +41,10 @@ _IO_un_link (fp) { if (fp->_flags & _IO_LINKED) { +#ifdef _IO_MTSAFE_IO _IO_FILE **f; _IO_lock_lock (list_all_lock); +#endif for (f = &_IO_list_all; *f != NULL; f = &(*f)->_chain) { if (*f == fp) @@ -49,7 +53,9 @@ _IO_un_link (fp) break; } } +#ifdef _IO_MTSAFE_IO _IO_lock_unlock (list_all_lock); +#endif fp->_flags &= ~_IO_LINKED; } } @@ -61,10 +67,14 @@ _IO_link_in (fp) if ((fp->_flags & _IO_LINKED) == 0) { fp->_flags |= _IO_LINKED; +#ifdef _IO_MTSAFE_IO _IO_lock_lock (list_all_lock); +#endif fp->_chain = _IO_list_all; _IO_list_all = fp; +#ifdef _IO_MTSAFE_IO _IO_lock_unlock (list_all_lock); +#endif } } |