View | Details | Raw Unified | Return to bug 8305
Collapse All | Expand All

(-)readline-4.3.orig/chardefs.h (-13 / +14 lines)
Lines 24-29 Link Here
24
#define _CHARDEFS_H_
24
#define _CHARDEFS_H_
25
25
26
#include <ctype.h>
26
#include <ctype.h>
27
#include "rlmbutil.h"
27
28
28
#if defined (HAVE_CONFIG_H)
29
#if defined (HAVE_CONFIG_H)
29
#  if defined (HAVE_STRING_H)
30
#  if defined (HAVE_STRING_H)
Lines 82-105 Link Here
82
/* Some systems define these; we want our definitions. */
83
/* Some systems define these; we want our definitions. */
83
#undef ISPRINT
84
#undef ISPRINT
84
85
85
#define ISALNUM(c)	(IN_CTYPE_DOMAIN (c) && isalnum (c))
86
#define ISALNUM(c)     ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && isalnum ((unsigned char) c))
86
#define ISALPHA(c)	(IN_CTYPE_DOMAIN (c) && isalpha (c))
87
#define ISALPHA(c)     ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && isalpha ((unsigned char) c))
87
#define ISDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isdigit (c))
88
#define ISDIGIT(c)     ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && isdigit ((unsigned char) c))
88
#define ISLOWER(c)	(IN_CTYPE_DOMAIN (c) && islower (c))
89
#define ISLOWER(c)     ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && islower ((unsigned char) c))
89
#define ISPRINT(c)	(IN_CTYPE_DOMAIN (c) && isprint (c))
90
#define ISPRINT(c)     ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && isprint ((unsigned char) c))
90
#define ISUPPER(c)	(IN_CTYPE_DOMAIN (c) && isupper (c))
91
#define ISUPPER(c)     ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && isupper ((unsigned char) c))
91
#define ISXDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isxdigit (c))
92
#define ISXDIGIT(c)    ((MB_CUR_MAX == 1 || IN_CTYPE_DOMAIN (c)) && isxdigit ((unsigned char) c))
92
93
93
#define _rl_lowercase_p(c)	(NON_NEGATIVE(c) && ISLOWER(c))
94
#define _rl_lowercase_p(c)     (ISLOWER(c))
94
#define _rl_uppercase_p(c)	(NON_NEGATIVE(c) && ISUPPER(c))
95
#define _rl_uppercase_p(c)     (ISUPPER(c))
95
#define _rl_digit_p(c)		((c) >= '0' && (c) <= '9')
96
#define _rl_digit_p(c)		((c) >= '0' && (c) <= '9')
96
97
97
#define _rl_pure_alphabetic(c)	(NON_NEGATIVE(c) && ISALPHA(c))
98
#define _rl_pure_alphabetic(c) (ISALPHA(c))
98
#define ALPHABETIC(c)		(NON_NEGATIVE(c) && ISALNUM(c))
99
#define ALPHABETIC(c)          (ISALNUM(c))
99
100
100
#ifndef _rl_to_upper
101
#ifndef _rl_to_upper
101
#  define _rl_to_upper(c) (_rl_lowercase_p(c) ? toupper((unsigned char)c) : (c))
102
#  define _rl_to_upper(c) (_rl_lowercase_p(c) ? toupper((unsigned char)c) : ((unsigned char) c))
102
#  define _rl_to_lower(c) (_rl_uppercase_p(c) ? tolower((unsigned char)c) : (c))
103
#  define _rl_to_lower(c) (_rl_uppercase_p(c) ? tolower((unsigned char)c) : ((unsigned char) c))
103
#endif
104
#endif
104
105
105
#ifndef _rl_digit_value
106
#ifndef _rl_digit_value

Return to bug 8305