Mercurial > hg > octave-lyh > gnulib-hg
changeset 7059:0fca2a1a6835
Avoid defining a substitute for the same function twice.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 28 Jul 2006 15:37:42 +0000 |
| parents | 35f0e7415e65 |
| children | 8d57e101d9f2 |
| files | lib/mbchar.h lib/wcwidth.h |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -167,6 +167,7 @@ ? (wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z') : 0); } +# define iswalnum iswalnum #endif #if !defined iswalpha && !HAVE_ISWCNTRL ststic inline int @@ -176,6 +177,7 @@ ? (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z' : 0); } +# define iswalpha iswalpha #endif #if !defined iswblank && !HAVE_ISWCNTRL ststic inline int @@ -185,6 +187,7 @@ ? wc == ' ' || wc == '\t' : 0); } +# define iswblank iswblank #endif #if !defined iswcntrl && !HAVE_ISWCNTRL ststic inline int @@ -194,6 +197,7 @@ ? (wc & ~0x1f) == 0 || wc == 0x7f : 0); } +# define iswcntrl iswcntrl #endif #if !defined iswdigit && !HAVE_ISWCNTRL ststic inline int @@ -201,6 +205,7 @@ { return (wc >= '0' && wc <= '9'); } +# define iswdigit iswdigit #endif #if !defined iswgraph && !HAVE_ISWCNTRL ststic inline int @@ -210,6 +215,7 @@ ? wc >= '!' && wc <= '~' : 1); } +# define iswgraph iswgraph #endif #if !defined iswlower && !HAVE_ISWCNTRL ststic inline int @@ -219,6 +225,7 @@ ? wc >= 'a' && wc <= 'z' : 0); } +# define iswlower iswlower #endif #if !defined iswprint && !HAVE_ISWCNTRL ststic inline int @@ -228,6 +235,7 @@ ? wc >= ' ' && wc <= '~' : 1); } +# define iswprint iswprint #endif #if !defined iswpunct && !HAVE_ISWCNTRL ststic inline int @@ -239,6 +247,7 @@ || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')) : 1); } +# define iswpunct iswpunct #endif #if !defined iswspace && !HAVE_ISWCNTRL ststic inline int @@ -249,6 +258,7 @@ || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r' : 0); } +# define iswspace iswspace #endif #if !defined iswupper && !HAVE_ISWCNTRL ststic inline int @@ -258,6 +268,7 @@ ? wc >= 'A' && wc <= 'Z' : 0); } +# define iswupper iswupper #endif #if !defined iswxdigit && !HAVE_ISWCNTRL ststic inline int @@ -265,6 +276,7 @@ { return (wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'); } +# define iswxdigit iswxdigit #endif #include "wcwidth.h"