summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-19 01:09:06 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-19 01:09:06 +0000
commitb6d64fb0f925a96e5fbce08daaefa443f71df939 (patch)
tree8c6ac3a10e8c23a98460c38ec08e59e3b9000be1 /wcsmbs
parent689849878df718e0ef82a5f44b281e3629d2ade0 (diff)
downloadglibc-b6d64fb0f925a96e5fbce08daaefa443f71df939.tar.gz
glibc-b6d64fb0f925a96e5fbce08daaefa443f71df939.tar.xz
glibc-b6d64fb0f925a96e5fbce08daaefa443f71df939.zip
Update.
	* wcsmbs/wchar.h (wcwdith): Change parameter type to wchar_t.
	* wcsmbs/wcwidth.c (wcwdith): Likewise.
	* wcsmbs/wcwidth.h (internal_wcwdith): Likewise.

	* conform/data/unistd.h-data: Remove _SC_MULTIPLE_PROCESS.

	* conform/data/ucontext.h-data: Fix typos in ucontext_t element tests.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wchar.h2
-rw-r--r--wcsmbs/wcwidth.c4
-rw-r--r--wcsmbs/wcwidth.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 46ed8d8458..b7b63baadc 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -324,7 +324,7 @@ extern size_t wcsnrtombs (char *__restrict __dst,
 /* The following functions are extensions found in X/Open CAE.  */
 #ifdef __USE_XOPEN
 /* Determine number of column positions required for C.  */
-extern int wcwidth (wint_t __c) __THROW;
+extern int wcwidth (wchar_t __c) __THROW;
 
 /* Determine number of column positions required for first N wide
    characters (or fewer if S ends before this) in S.  */
diff --git a/wcsmbs/wcwidth.c b/wcsmbs/wcwidth.c
index 6631c47ead..82dd0201df 100644
--- a/wcsmbs/wcwidth.c
+++ b/wcsmbs/wcwidth.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -21,7 +21,7 @@
 
 /* Determine number of column positions required for CH.  */
 int
-wcwidth (wint_t ch)
+wcwidth (wchar_t ch)
 {
   return internal_wcwidth (ch);
 }
diff --git a/wcsmbs/wcwidth.h b/wcsmbs/wcwidth.h
index 2cea530a16..92ee3d62fe 100644
--- a/wcsmbs/wcwidth.h
+++ b/wcsmbs/wcwidth.h
@@ -1,5 +1,5 @@
 /* Internal header containing implementation of wcwidth() function.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -26,7 +26,7 @@
 extern const char *__ctype32_width;
 
 static __inline int
-internal_wcwidth (wint_t wc)
+internal_wcwidth (wchar_t wc)
 {
   unsigned char res;