about summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-17 07:51:36 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-17 07:51:36 +0000
commit6293b80374f7c7b017515b9a8716a9ea16eb063a (patch)
treee2c8c00c351a5da2e44e534f298c65901e085303 /iconv
parent51028f34ceeb7c4c91abc2ac2b818afeaa671b91 (diff)
downloadglibc-6293b80374f7c7b017515b9a8716a9ea16eb063a.tar.gz
glibc-6293b80374f7c7b017515b9a8716a9ea16eb063a.tar.xz
glibc-6293b80374f7c7b017515b9a8716a9ea16eb063a.zip
Update.
2001-08-17  Ulrich Drepper  <drepper@redhat.com>

	* sunrpc/svc_simple.c (universal): Use __write instead of write.

	* wcsmbs/wcscoll.c: Also define __wcscoll.
	* include/wchar.h: Declare __wcscoll.

	* libio/fwprintf.c: Use __vfwprintf instead of vfwprintf.
	* libio/vwprintf.c: Likewise.
	* libio/wprintf.c: Likewise.

	* iconv/gconv_cache.c: Use __munmap instead of munmap.

	* posix/regex.c [_LIBC] (convert_mbs_to_wcs): Use __mbrtowc
	instead of mbrtowc.
	[_LIBC]: Use __iswctype instead of iswctype, __wcslen instead of
	wcslen, and __wcscoll instead of wcscoll.

	* sysdeps/unix/sockatmark.c (sockatmark): Use __ioctl instead of ioctl.

	* sysdeps/unix/sysv/linux/gai_sigqueue.c (__gai_sigqueue): Use
	__getuid instead of getuid.

	* stdio-common/perror.c (perror): Use __close instead of close.
	* iconv/gconv_cache.c (__gconv_load_cache): Likewise.
	* libio/freopen.c (freopen): Likewise.
	* libio/freopen64.c (freopen64): Likewise.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_cache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c
index 1009cedc58..b4fd8d9836 100644
--- a/iconv/gconv_cache.c
+++ b/iconv/gconv_cache.c
@@ -63,7 +63,7 @@ __gconv_load_cache (void)
       || st.st_size < sizeof (struct gconvcache_header))
     {
     close_and_exit:
-      close (fd);
+      __close (fd);
       return -1;
     }
 
@@ -100,7 +100,7 @@ __gconv_load_cache (void)
     }
 
   /* We don't need the file descriptor anymore.  */
-  close (fd);
+  __close (fd);
 
   /* Check the consistency.  */
   header = (struct gconvcache_header *) cache;
@@ -121,7 +121,7 @@ __gconv_load_cache (void)
 	}
 #ifdef _POSIX_MAPPED_FILES
       else
-	munmap (cache, cache_size);
+	__munmap (cache, cache_size);
 #endif
       cache = NULL;
 
@@ -444,7 +444,7 @@ free_mem (void)
     free (cache);
 #ifdef _POSIX_MAPPED_FILES
   else
-    munmap (cache, cache_size);
+    __munmap (cache, cache_size);
 #endif
 }