projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
quotearg.c
diff --git
a/lib/quotearg.c
b/lib/quotearg.c
index
a9c9fe3
..
d5fbc9e
100644
(file)
--- a/
lib/quotearg.c
+++ b/
lib/quotearg.c
@@
-92,15
+92,14
@@
size_t mbrtowc ();
#define INT_BITS (sizeof (int) * CHAR_BIT)
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
#define INT_BITS (sizeof (int) * CHAR_BIT)
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-/* Undefine to protect against the definition in wctype.h of solaris2.6. */
-# undef ISASCII
-# define ISASCII(c) 1
+# define IN_CTYPE_DOMAIN(c) 1
#else
#else
-# define I
SASCII(c) isascii
(c)
+# define I
N_CTYPE_DOMAIN(c) isascii
(c)
#endif
#endif
+
/* Undefine to protect against the definition in wctype.h of solaris2.6. */
#undef ISPRINT
/* Undefine to protect against the definition in wctype.h of solaris2.6. */
#undef ISPRINT
-#define ISPRINT(c) (I
SASCII
(c) && isprint (c))
+#define ISPRINT(c) (I
N_CTYPE_DOMAIN
(c) && isprint (c))
struct quoting_options
{
struct quoting_options
{
@@
-539,8
+538,8
@@
quotearg_n_options (int n, char const *arg,
size_t size;
char *val;
};
size_t size;
char *val;
};
- static struct slotvec
const
slotvec0 = {sizeof slot0, slot0};
- static struct slotvec *slotvec =
(struct slotvec *)
&slotvec0;
+ static struct slotvec slotvec0 = {sizeof slot0, slot0};
+ static struct slotvec *slotvec = &slotvec0;
if (nslots <= n)
{
if (nslots <= n)
{