CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-11 14:44:18 +02:00
Code Issues Projects Releases Wiki Activity

merge with 1.9.1a

Browse Source
This commit is contained in:
Jim Meyering
1993-12-17 23:51:12 +00:00
parent f4c0b38042
commit 0311e952db
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/regex.c
View File

@@ -148,32 +148,34 @@ init_syntax_once ()
macros don't need to be guarded with references to isascii. ...
Defining isascii to 1 should let any compiler worth its salt
eliminate the && through constant folding." */
#if ! defined (isascii) || defined (STDC_HEADERS)
#undef isascii
#define isascii(c) 1
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
#define ISASCII(c) 1
#else
#define ISASCII(c) isascii(c)
#endif
#ifdef isblank
#define ISBLANK(c) (isascii (c) && isblank (c))
#define ISBLANK(c) (ISASCII (c) && isblank (c))
#else
#define ISBLANK(c) ((c) == ' ' || (c) == '\t')
#endif
#ifdef isgraph
#define ISGRAPH(c) (isascii (c) && isgraph (c))
#define ISGRAPH(c) (ISASCII (c) && isgraph (c))
#else
#define ISGRAPH(c) (isascii (c) && isprint (c) && !isspace (c))
#define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c))
#endif
#define ISPRINT(c) (isascii (c) && isprint (c))
#define ISDIGIT(c) (isascii (c) && isdigit (c))
#define ISALNUM(c) (isascii (c) && isalnum (c))
#define ISALPHA(c) (isascii (c) && isalpha (c))
#define ISCNTRL(c) (isascii (c) && iscntrl (c))
#define ISLOWER(c) (isascii (c) && islower (c))
#define ISPUNCT(c) (isascii (c) && ispunct (c))
#define ISSPACE(c) (isascii (c) && isspace (c))
#define ISUPPER(c) (isascii (c) && isupper (c))
#define ISXDIGIT(c) (isascii (c) && isxdigit (c))
#define ISPRINT(c) (ISASCII (c) && isprint (c))
#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
#define ISALNUM(c) (ISASCII (c) && isalnum (c))
#define ISALPHA(c) (ISASCII (c) && isalpha (c))
#define ISCNTRL(c) (ISASCII (c) && iscntrl (c))
#define ISLOWER(c) (ISASCII (c) && islower (c))
#define ISPUNCT(c) (ISASCII (c) && ispunct (c))
#define ISSPACE(c) (ISASCII (c) && isspace (c))
#define ISUPPER(c) (ISASCII (c) && isupper (c))
#define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
#ifndef NULL
#define NULL 0
@@ -3021,7 +3023,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends)
{
bufp->regs_allocated = REGS_UNALLOCATED;
regs->num_regs = 0;
regs->start = regs->end = (regoff_t) 0;
regs->start = regs->end = (regoff_t *) 0;
}
}

15
old/textutils/ChangeLog
View File

@@ -1,3 +1,18 @@
Thu Dec 02 23:53:03 1993 Jim Meyering (meyering@comco.com)
* configure.in (AC_HAVE_FUNCS): Add isascii.
* system.h [!defined (isascii) || defined (STDC_HEADERS)]: This failed
on AIX PS/2 1.3 systems because isascii is a function and it is used
in definitions (with the necessary side effect of assigning to a
global variable) of the is* macros. Also test HAVE_ISASCII and
redefine ISASCII(c) instead of isascii.
Reported by Minh Tran-Le (tranle@intellicorp.com).
Fri Nov 19 22:41:48 1993 Jim Meyering (meyering@comco.com)
* configure.in: Don't run the test for 8-bit clean memset if we
already know we'll be using our replacement.
Fri Nov 12 00:44:49 1993 Jim Meyering (meyering@comco.com)
* Version 1.9.1.