strtol: remove dependency on wchar

* lib/strtol.c: Include <wchar.h> only if USE_WIDE_CHAR is defined.
* modules/strtol (Depends-on): Remove wchar.

diff --git a/ChangeLog b/ChangeLog
index c9f717e1da02f2b020e01c5ad8295a3e1969701e..6df0d4e8799d7e97168822b7eafba83d5f7f63c8 100644 (file)
--- 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 b6a761ecb9c0299ec1ab208c9cdd6e59203b6469..6c15d11e8f8d4047698f40d394cb2827a81f3b0c 100644 (file)
--- 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 8a313a4029610e45190f7f8555a9b7463aaacb3a..d06a55b14b65794337a9a5d1825ea1481ba82843 100644 (file)
--- 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
-