diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-12-22 12:11:44 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2008-12-22 12:11:44 +0100 |
| commit | 4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4 (patch) | |
| tree | 73f83433f8d40c84f098fb4e179b97f1dbcc2cba /lib/mbstok_r.c | |
| parent | 3e2e5dc1f6ded97ce60498e3ceb67fca5a41b8a8 (diff) | |
| download | gnulib-4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4.tar.gz | |
Remove HAVE_MBRTOWC conditionals. Use mbrtowc unconditionally.
Diffstat (limited to 'lib/mbstok_r.c')
| -rw-r--r-- | lib/mbstok_r.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/mbstok_r.c b/lib/mbstok_r.c index 06fdc8d8fc..b698d3fad2 100644 --- a/lib/mbstok_r.c +++ b/lib/mbstok_r.c @@ -1,5 +1,5 @@ /* Tokenizing a string. - Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify @@ -20,14 +20,11 @@ /* Specification. */ #include <string.h> -#if HAVE_MBRTOWC -# include "mbuiter.h" -#endif +#include "mbuiter.h" char * mbstok_r (char *string, const char *delim, char **save_ptr) { -#if HAVE_MBRTOWC if (MB_CUR_MAX > 1) { if (string == NULL) @@ -65,6 +62,5 @@ mbstok_r (char *string, const char *delim, char **save_ptr) return string; } else -#endif return strtok_r (string, delim, save_ptr); } |