summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-12-29 23:21:21 +0000
committerUlrich Drepper <drepper@redhat.com>2008-12-29 23:21:21 +0000
commit5703f4727380ca751da51a94664689b5e97dc89f (patch)
tree42a7904610946d5219f9d8c9a3e8eba9be1d7aac
parent0f2ae55cf707947688bd28b55899a148fd3d7646 (diff)
downloadglibc-5703f4727380ca751da51a94664689b5e97dc89f.tar.gz
* wctype/wctype.h: Get wint_t definition directly from <stddef.h>.
* wctype/Makefile (tests): Add bug-wctypeh. * wctype/bug-wctypeh.c: New file.
-rw-r--r--ChangeLog3
-rw-r--r--wctype/Makefile4
-rw-r--r--wctype/bug-wctypeh.c10
-rw-r--r--wctype/wctype.h6
4 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 333c502451..22d8804e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
[BZ #9694]
* wcsmbs/wchar.h: Move undefs for local __need_* constants to the
very end.
+ * wctype/wctype.h: Get wint_t definition directly from <stddef.h>.
+ * wctype/Makefile (tests): Add bug-wctypeh.
+ * wctype/bug-wctypeh.c: New file.
* nscd/nscd_gethst_r.c (nscd_gethst_r): Don't use nscd if
LOCALDOMAIN is defined.
diff --git a/wctype/Makefile b/wctype/Makefile
index b0e8f968e4..9505b1fabb 100644
--- a/wctype/Makefile
+++ b/wctype/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2008 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
@@ -26,6 +26,6 @@ distribute := wchar-lookup.h
routines := wcfuncs wctype iswctype wctrans towctrans \
wcfuncs_l wctype_l iswctype_l wctrans_l towctrans_l
-tests := test_wctype test_wcfuncs
+tests := test_wctype test_wcfuncs bug-wctypeh
include ../Rules
diff --git a/wctype/bug-wctypeh.c b/wctype/bug-wctypeh.c
new file mode 100644
index 0000000000..9d5acb3a5c
--- /dev/null
+++ b/wctype/bug-wctypeh.c
@@ -0,0 +1,10 @@
+#include <wchar.h>
+#include <wctype.h>
+#include <stddef.h>
+ptrdiff_t i;
+
+int
+main (void)
+{
+ return 0;
+}
diff --git a/wctype/wctype.h b/wctype/wctype.h
index 603255931f..c36f0aa0d0 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2002, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2002, 2005, 2007, 2008 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
@@ -29,9 +29,9 @@
#ifndef __need_iswxxx
# define _WCTYPE_H 1
-/* Get wint_t from <wchar.h>. */
+/* Get wint_t from <stddef.h>. */
# define __need_wint_t
-# include <wchar.h>
+# include <stddef.h>
/* Constant expression of type `wint_t' whose value does not correspond
to any member of the extended character set. */