From 46380c372f75d7a8609c6646e48099a9b84f7ec2 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 22 Apr 2011 00:45:04 -0700
Subject: [PATCH] strtol: remove dependency on wchar

* lib/strtol.c: Include <wchar.h> only if USE_WIDE_CHAR is defined.
* modules/strtol (Depends-on): Remove wchar.
---
 ChangeLog      | 6 ++++++
 lib/strtol.c   | 3 +--
 modules/strtol | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9f717e1d..6df0d4e87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	strtol: remove dependency on wchar
+	* lib/strtol.c: Include <wchar.h> only if USE_WIDE_CHAR is defined.
+	* modules/strtol (Depends-on): Remove wchar.
+
 2011-04-21  Eric Blake  <eblake@redhat.com>
 
 	passfd: fix test regression on Linux
diff --git a/lib/strtol.c b/lib/strtol.c
index b6a761ecb..6c15d11e8 100644
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -186,9 +186,8 @@
 # define LOCALE_PARAM_PROTO
 #endif
 
-#include <wchar.h>
-
 #ifdef USE_WIDE_CHAR
+# include <wchar.h>
 # include <wctype.h>
 # define L_(Ch) L##Ch
 # define UCHAR_TYPE wint_t
diff --git a/modules/strtol b/modules/strtol
index 8a313a402..d06a55b14 100644
--- a/modules/strtol
+++ b/modules/strtol
@@ -6,7 +6,6 @@ lib/strtol.c
 m4/strtol.m4
 
 Depends-on:
-wchar
 
 configure.ac:
 gl_FUNC_STRTOL
@@ -21,4 +20,3 @@ LGPL
 
 Maintainer:
 glibc
-
-- 
2.11.0