2008-12-29  Ulrich Drepper  <drepper@redhat.com>
 
	[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.

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 0fd9e35..aaf278d 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2004,2005,2006,2007 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2004,2005,2006,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
@@ -839,9 +839,9 @@ __END_DECLS
 
 #endif	/* _WCHAR_H defined */
 
+#endif /* wchar.h  */
+
 /* Undefined all __need_* constants in case we are included to get those
    constants but the whole file was already read.  */
 #undef __need_mbstate_t
 #undef __need_wint_t
-
-#endif /* wchar.h  */
diff --git a/wctype/Makefile b/wctype/Makefile
index b0e8f96..9505b1f 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 0000000..9d5acb3
--- /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 6032559..c36f0aa 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.  */