about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-04 08:05:56 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-04 08:05:56 +0000
commit6906cea4cc14c72110dc35c625491d482d4caef1 (patch)
tree858973a2557a4ab9a3761e13ec401fa9bec9dfbf /malloc
parent03003424c30119b74deb19557d809a3142e5a70d (diff)
downloadglibc-6906cea4cc14c72110dc35c625491d482d4caef1.tar.gz
glibc-6906cea4cc14c72110dc35c625491d482d4caef1.tar.xz
glibc-6906cea4cc14c72110dc35c625491d482d4caef1.zip
Update.
2001-08-04  Ulrich Drepper  <drepper@redhat.com>

	* libio/genops.c (_IO_unbuffer_write): Force streams in narrow
	orientation so that conversion modules aren't used anymore.
	* malloc/set-freeres.c: Call _IO_cleanup before running subfreeres
	functions to avoid using wide streams afterwards.

	* iconvdata/Makefile: Add rules to build GEORGIAN-PS and
	GEORGIAN-ACADEMY.
	* iconvdata/georgian-ps.c: New file.
	* iconvdata/georgian-academy.c: New file.
	* iconvdata/gconv-modules: Add entries for GEORGIAN-PS and
	GEORGIAN-ACADEMY.
	* iconvdata/tst-tables.sh: Add GEORGIAN-PS and GEORGIAN-ACADEMY.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/set-freeres.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c
index 1724070704..d836d0c1bf 100644
--- a/malloc/set-freeres.c
+++ b/malloc/set-freeres.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,6 +21,10 @@
 #include <set-hooks.h>
 #include <libc-internal.h>
 
+#ifdef USE_IN_LIBIO
+# include "../libio/libioP.h"
+#endif
+
 DEFINE_HOOK (__libc_subfreeres, (void));
 
 void
@@ -31,5 +35,11 @@ __libc_freeres (void)
   static long int already_called;
 
   if (compare_and_swap (&already_called, 0, 1))
-    RUN_HOOK (__libc_subfreeres, ());
+    {
+#ifdef USE_IN_LIBIO
+      _IO_cleanup ();
+#endif
+
+      RUN_HOOK (__libc_subfreeres, ());
+    }
 }