diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 1999-09-27 08:57:04 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 1999-09-27 08:57:04 +0000 |
| commit | fd12515e9fc4be7176fa5d58edeef092e5b4e09d (patch) | |
| tree | 8e801099997d6dd9285e5794abcda7b7cdfdd155 /contrib/awk/awk.h | |
| parent | b54765f9845daf3cf7b91b9709780162d1a3e9f3 (diff) | |
| download | FreeBSD-src-fd12515e9fc4be7176fa5d58edeef092e5b4e09d.zip FreeBSD-src-fd12515e9fc4be7176fa5d58edeef092e5b4e09d.tar.gz | |
Fix conflicts. Add $FreeBSD$ as needed.
Diffstat (limited to 'contrib/awk/awk.h')
| -rw-r--r-- | contrib/awk/awk.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/contrib/awk/awk.h b/contrib/awk/awk.h index 3ab2015..621a981 100644 --- a/contrib/awk/awk.h +++ b/contrib/awk/awk.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 1986, 1988, 1989, 1991-1997 the Free Software Foundation, Inc. + * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. @@ -21,10 +21,20 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $FreeBSD$ */ /* ------------------------------ Includes ------------------------------ */ +/* + * config.h absolutely, positively, *M*U*S*T* be included before + * any system headers. Otherwise, extreme death, destruction + * and loss of life results. + * + * Well, OK, gawk just won't work on systems using egcs and LFS. But + * that's almost as bad. + */ #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -34,6 +44,7 @@ #endif /* _GNU_SOURCE */ #include <stdio.h> +#include <assert.h> #ifdef HAVE_LIMITS_H #include <limits.h> #endif /* HAVE_LIMITS_H */ @@ -588,7 +599,8 @@ extern char casetable[]; /* for case-independent regexp matching */ /* ------------------------- Pseudo-functions ------------------------- */ #define is_identchar(c) (isalnum(c) || (c) == '_') -#define isnondecimal(str) (((str)[0]) == '0') +#define isnondecimal(str) (((str)[0]) == '0' && (ISDIGIT((str)[1]) \ + || (str)[1] == 'x' || (str)[1] == 'X')) #ifdef MPROF #define getnode(n) emalloc(n, NODE *, sizeof(NODE), "getnode") |
