bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] strtol: remove dependency on wchar


From: Paul Eggert
Subject: [PATCH] strtol: remove dependency on wchar
Date: Fri, 22 Apr 2011 01:10:24 -0700
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Thunderbird/3.1.8

I added the strtoumax module to a test version of Emacs, and it
pulled in a lot of gnulib stuff that it didn't need.  The diff
is about 200 kB
<http://debbugs.gnu.org/cgi/bugreport.cgi?msg=14;filename=strtoumax-patch.txt.gz;att=1;bug=8525>

One simple fix can remove the need for the wchar module, so I installed
the following.  I plan to send email about more fixes soon.

>From 136964f395da144f507792d833442105120a7d4c Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
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 c9f717e..6df0d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-22  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        passfd: fix test regression on Linux
diff --git a/lib/strtol.c b/lib/strtol.c
index b6a761e..6c15d11 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 8a313a4..d06a55b 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
-
-- 
1.7.4.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]