aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog28
-rw-r--r--ChangeLog.02
-rw-r--r--NEWS10
-rw-r--r--awk.h12
-rw-r--r--awkgram.c31
-rw-r--r--awkgram.y31
-rw-r--r--configh.in12
-rwxr-xr-xconfigure34
-rw-r--r--configure.ac20
-rw-r--r--custom.h5
-rw-r--r--doc/ChangeLog7
-rw-r--r--doc/gawk.info114
-rw-r--r--doc/gawk.texi6
-rw-r--r--doc/gawktexi.in6
-rw-r--r--missing_d/ChangeLog4
-rw-r--r--missing_d/gawkbool.h40
-rw-r--r--support/ChangeLog2
-rw-r--r--support/dfa.h4
-rw-r--r--support/regex.c3
19 files changed, 133 insertions, 238 deletions
diff --git a/ChangeLog b/ChangeLog
index 3255d8e8..fa71dceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,25 @@
* field.c (do_split): Simplify the lint warnings.
Based on suggested code by Eric Pruitt <eric.pruitt@gmail.com>.
+ Unrelated:
+
+ * awkgram.y (check_funcs): Remove the REALLYMEAN ifdef and
+ simplify the lint checking code for function defined but not
+ called or called but not defined.
+
+2017-10-13 Arnold D. Robbins <arnold@skeeve.com>
+
+ Assume a more C99 environment:
+
+ * awk.h: Assume we have limits.h, stdarg.h and stdbool.h.
+ * configure.ac: Remove checks for limits.h and stdarg.h.
+
+2017-10-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * configure.ac: Remove --with-whiny-user-strftime option.
+ * NEWS: Updated.
+ * ChangeLog.0: Fix a typo. :-)
+
2017-10-08 Arnold D. Robbins <arnold@skeeve.com>
* command.y: Fix the FSF's address.
@@ -82,6 +101,14 @@
2017-10-02 Arnold D. Robbins <arnold@skeeve.com>
+ Undo change of 2014-09-07:
+
+ * configure.ac: Remove the undocumented option to enable locale
+ letters in identifiers.
+ * awkgram.y (is_alpha): Remove related code.
+
+2017-10-02 Arnold D. Robbins <arnold@skeeve.com>
+
* config.guess, config.sub: Updated.
2017-09-28 Arnold D. Robbins <arnold@skeeve.com>
@@ -3770,6 +3797,7 @@
* configure.ac: Add an option to enable locale letters in identifiers.
Undocumented and subject to being rescinded at any time in the future.
+ * awkgram.y (is_alpha): Actual code is here.
* NEWS: Mention to look at configure --help.
Unrelated:
diff --git a/ChangeLog.0 b/ChangeLog.0
index af6bd99f..595442d4 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -7020,7 +7020,7 @@ Tue Dec 4 17:54:30 2001 Arnold D. Robbins <arnold@skeeve.com>
* configure.in (AC_ARG_WITH): Add appropriate code for autoconf.
* accondig.h (USE_INCLUDED_STRFTIME): Add #undef for it.
- * custom.h (USE_INCLUDED_STRFTIME): Set things up write.
+ * custom.h (USE_INCLUDED_STRFTIME): Set things up right.
Tue Dec 4 16:44:07 2001 Andreas Buening <andreas.buening@nexgo.de>
diff --git a/NEWS b/NEWS
index 22e6eec8..e57a4244 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,16 @@
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
+Changes from 4.2.x to 5.0.0
+---------------------------
+
+1. The undocumented configure option and code that enabled the use of
+ non-English "letters" in identifiers is now gone.
+
+2. The `--with-whiny-user-strftime' configuration option is now gone.
+
+3. The code now makes some stronger assumptions about a C99 environment.
+
Changes from 4.2.0 to 4.2.1
---------------------------
diff --git a/awk.h b/awk.h
index 5eec241e..895dad9a 100644
--- a/awk.h
+++ b/awk.h
@@ -53,9 +53,7 @@
#include <stdio.h>
#include <assert.h>
-#ifdef HAVE_LIMITS_H
#include <limits.h>
-#endif /* HAVE_LIMITS_H */
#include <ctype.h>
#include <setjmp.h>
@@ -73,11 +71,8 @@
#error "gawk no longer supports non-C89 environments (no __STDC__ or __STDC__ < 1)"
#endif
-#if defined(HAVE_STDARG_H)
#include <stdarg.h>
-#else
-#error "gawk no longer supports <varargs.h>. Please update your compiler and runtime"
-#endif
+#include <stdbool.h>
#include <signal.h>
#include <time.h>
#include <errno.h>
@@ -89,11 +84,6 @@ extern int errno;
#include <stdlib.h>
#endif /* not STDC_HEADERS */
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#else
-#include "missing_d/gawkbool.h"
-#endif
/* We can handle multibyte strings. */
#include <wchar.h>
diff --git a/awkgram.c b/awkgram.c
index 1700a836..dbffa404 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -7358,22 +7358,19 @@ check_funcs()
for (i = 0; i < HASHSIZE; i++) {
for (fp = ftable[i]; fp != NULL; fp = fp->next) {
-#ifdef REALLYMEAN
- /* making this the default breaks old code. sigh. */
- if (fp->defined == 0 && ! fp->extension) {
- error(
- _("function `%s' called but never defined"), fp->name);
- errcount++;
- }
-#else
- if (do_lint && fp->defined == 0 && ! fp->extension)
- lintwarn(
- _("function `%s' called but never defined"), fp->name);
-#endif
+ if (do_lint && ! fp->extension) {
+ /*
+ * Making this not a lint check and
+ * incrementing * errcount breaks old code.
+ * Sigh.
+ */
+ if (fp->defined == 0)
+ lintwarn(_("function `%s' called but never defined"),
+ fp->name);
- if (do_lint && fp->used == 0 && ! fp->extension) {
- lintwarn(_("function `%s' defined but never called directly"),
- fp->name);
+ if (fp->used == 0)
+ lintwarn(_("function `%s' defined but never called directly"),
+ fp->name);
}
}
}
@@ -8703,9 +8700,6 @@ install_builtins(void)
bool
is_alpha(int c)
{
-#ifdef I_DONT_KNOW_WHAT_IM_DOING
- return isalpha(c);
-#else /* ! I_DONT_KNOW_WHAT_IM_DOING */
switch (c) {
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
@@ -8720,7 +8714,6 @@ is_alpha(int c)
return true;
}
return false;
-#endif /* ! I_DONT_KNOW_WHAT_IM_DOING */
}
/* is_alnum --- return true for alphanumeric, English only letters */
diff --git a/awkgram.y b/awkgram.y
index 9f351436..cf1b7aa6 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -4938,22 +4938,19 @@ check_funcs()
for (i = 0; i < HASHSIZE; i++) {
for (fp = ftable[i]; fp != NULL; fp = fp->next) {
-#ifdef REALLYMEAN
- /* making this the default breaks old code. sigh. */
- if (fp->defined == 0 && ! fp->extension) {
- error(
- _("function `%s' called but never defined"), fp->name);
- errcount++;
- }
-#else
- if (do_lint && fp->defined == 0 && ! fp->extension)
- lintwarn(
- _("function `%s' called but never defined"), fp->name);
-#endif
+ if (do_lint && ! fp->extension) {
+ /*
+ * Making this not a lint check and
+ * incrementing * errcount breaks old code.
+ * Sigh.
+ */
+ if (fp->defined == 0)
+ lintwarn(_("function `%s' called but never defined"),
+ fp->name);
- if (do_lint && fp->used == 0 && ! fp->extension) {
- lintwarn(_("function `%s' defined but never called directly"),
- fp->name);
+ if (fp->used == 0)
+ lintwarn(_("function `%s' defined but never called directly"),
+ fp->name);
}
}
}
@@ -6283,9 +6280,6 @@ install_builtins(void)
bool
is_alpha(int c)
{
-#ifdef I_DONT_KNOW_WHAT_IM_DOING
- return isalpha(c);
-#else /* ! I_DONT_KNOW_WHAT_IM_DOING */
switch (c) {
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
@@ -6300,7 +6294,6 @@ is_alpha(int c)
return true;
}
return false;
-#endif /* ! I_DONT_KNOW_WHAT_IM_DOING */
}
/* is_alnum --- return true for alphanumeric, English only letters */
diff --git a/configh.in b/configh.in
index e6000054..2bd480ab 100644
--- a/configh.in
+++ b/configh.in
@@ -108,9 +108,6 @@
/* Define if you have the libsigsegv library. */
#undef HAVE_LIBSIGSEGV
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
@@ -186,9 +183,6 @@
/* we have sockets on this system */
#undef HAVE_SOCKETS
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
-
/* Define to 1 if stdbool.h conforms to C99. */
#undef HAVE_STDBOOL_H
@@ -341,9 +335,6 @@
/* Define to 1 if you have the `__etoa_l' function. */
#undef HAVE___ETOA_L
-/* enable severe portability problems */
-#undef I_DONT_KNOW_WHAT_IM_DOING
-
/* disable lint checks */
#undef NO_LINT
@@ -395,9 +386,6 @@
/* Define to 1 if the character set is EBCDIC */
#undef USE_EBCDIC
-/* force use of our version of strftime */
-#undef USE_INCLUDED_STRFTIME
-
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
diff --git a/configure b/configure
index f0f13e93..939cd864 100755
--- a/configure
+++ b/configure
@@ -763,9 +763,7 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_silent_rules
-with_whiny_user_strftime
enable_lint
-enable_severe_portability_problems
enable_builtin_intdiv0
enable_mpfr
enable_dependency_tracking
@@ -1412,8 +1410,6 @@ Optional Features:
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
--disable-lint do not compile in gawk lint checking
- --enable-severe-portability-problems
- allow really nasty portability problems
--enable-builtin-intdiv0
enable built-in intdiv0 function
--disable-mpfr do not check for MPFR
@@ -1429,9 +1425,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-whiny-user-strftime
- force use of included version of strftime for
- deficient systems
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
@@ -3214,18 +3207,6 @@ fi
-
-# Check whether --with-whiny-user-strftime was given.
-if test "${with_whiny_user_strftime+set}" = set; then :
- withval=$with_whiny_user_strftime; if test "$withval" = yes
- then
-
-$as_echo "#define USE_INCLUDED_STRFTIME 1" >>confdefs.h
-
- fi
-
-fi
-
# Check whether --enable-lint was given.
if test "${enable_lint+set}" = set; then :
enableval=$enable_lint; if test "$enableval" = no
@@ -3237,17 +3218,6 @@ $as_echo "#define NO_LINT 1" >>confdefs.h
fi
-# Check whether --enable-severe-portability-problems was given.
-if test "${enable_severe_portability_problems+set}" = set; then :
- enableval=$enable_severe_portability_problems; if test "$enableval" = yes
- then
-
-$as_echo "#define I_DONT_KNOW_WHAT_IM_DOING 1" >>confdefs.h
-
- fi
-
-fi
-
# Check whether --enable-builtin-intdiv0 was given.
if test "${enable_builtin_intdiv0+set}" = set; then :
enableval=$enable_builtin_intdiv0; if test "$enableval" = yes
@@ -8029,8 +7999,8 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
fi
-for ac_header in arpa/inet.h fcntl.h limits.h locale.h libintl.h mcheck.h \
- netdb.h netinet/in.h stdarg.h stddef.h string.h \
+for ac_header in arpa/inet.h fcntl.h locale.h libintl.h mcheck.h \
+ netdb.h netinet/in.h stddef.h string.h \
sys/ioctl.h sys/param.h sys/select.h sys/socket.h sys/time.h unistd.h \
termios.h stropts.h wchar.h wctype.h
do :
diff --git a/configure.ac b/configure.ac
index abd977c7..8503c421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,15 +44,6 @@ AM_INIT_AUTOMAKE([1.15 dist-xz dist-lzip])
AC_CONFIG_MACRO_DIR([m4])
-dnl Additional argument stuff
-AC_ARG_WITH(whiny-user-strftime,
- [AS_HELP_STRING([--with-whiny-user-strftime], [force use of included version of strftime for deficient systems])],
- if test "$withval" = yes
- then
- AC_DEFINE(USE_INCLUDED_STRFTIME, 1,
- [force use of our version of strftime])
- fi
-)
AC_ARG_ENABLE([lint],
[AS_HELP_STRING([--disable-lint],[do not compile in gawk lint checking])],
if test "$enableval" = no
@@ -60,13 +51,6 @@ AC_ARG_ENABLE([lint],
AC_DEFINE(NO_LINT, 1, [disable lint checks])
fi
)
-AC_ARG_ENABLE([severe-portability-problems],
- [AS_HELP_STRING([--enable-severe-portability-problems],[allow really nasty portability problems])],
- if test "$enableval" = yes
- then
- AC_DEFINE(I_DONT_KNOW_WHAT_IM_DOING, 1, [enable severe portability problems])
- fi
-)
AC_ARG_ENABLE([builtin-intdiv0],
[AS_HELP_STRING([--enable-builtin-intdiv0],[enable built-in intdiv0 function])],
if test "$enableval" = yes
@@ -158,8 +142,8 @@ AM_LANGINFO_CODESET
gt_LC_MESSAGES
dnl checks for header files
-AC_CHECK_HEADERS(arpa/inet.h fcntl.h limits.h locale.h libintl.h mcheck.h \
- netdb.h netinet/in.h stdarg.h stddef.h string.h \
+AC_CHECK_HEADERS(arpa/inet.h fcntl.h locale.h libintl.h mcheck.h \
+ netdb.h netinet/in.h stddef.h string.h \
sys/ioctl.h sys/param.h sys/select.h sys/socket.h sys/time.h unistd.h \
termios.h stropts.h wchar.h wctype.h)
AC_HEADER_STDC
diff --git a/custom.h b/custom.h
index 90fd1f63..ef330167 100644
--- a/custom.h
+++ b/custom.h
@@ -48,11 +48,6 @@
#define HAVE_MKTIME 1
#endif
-/* For whiny users */
-#ifdef USE_INCLUDED_STRFTIME
-#undef HAVE_STRFTIME
-#endif
-
/* For HP/UX with gcc */
#if defined(hpux) || defined(_HPUX_SOURCE)
#undef HAVE_TZSET
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 761b4da8..3d0c232f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -48,7 +48,12 @@
function to be syntactically and semantically correct. Thanks to
Jaromir Obr <jaromir.obr@gmail.com> for the report.
(POSIX String Comparison): Add some URL references in @ignore.
-
+
+ Unrelated:
+
+ * gawktexi.in: Remove description of --with-whiny-user-strftime
+ configuration option.
+
2017-10-08 Andrew J. Schorr <aschorr@telemetry-investments.com>
* gawktexi.in: Fix discussion of AWKPATH in section on @include.
diff --git a/doc/gawk.info b/doc/gawk.info
index 405313a1..430c90f8 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -28960,10 +28960,6 @@ command line when compiling 'gawk' from scratch, including:
desirable, but it may bring you some slight performance
improvement.
-'--with-whiny-user-strftime'
- Force use of the included version of the C 'strftime()' function
- for deficient systems.
-
Use the command './configure --help' to see the full list of options
supplied by 'configure'.
@@ -32902,8 +32898,6 @@ Index
* --traditional option, --posix option and: Options. (line 286)
* --use-lc-numeric option: Options. (line 232)
* --version option: Options. (line 318)
-* --with-whiny-user-strftime configuration option: Additional Configuration Options.
- (line 42)
* -b option: Options. (line 69)
* -c option: Options. (line 82)
* -C option: Options. (line 89)
@@ -33607,8 +33601,6 @@ Index
(line 32)
* configuration option, --disable-nls: Additional Configuration Options.
(line 37)
-* configuration option, --with-whiny-user-strftime: Additional Configuration Options.
- (line 42)
* configuration options, gawk: Additional Configuration Options.
(line 6)
* constant regexps: Regexp Usage. (line 57)
@@ -36434,58 +36426,58 @@ Node: Unix Installation1162843
Node: Quick Installation1163525
Node: Shell Startup Files1165939
Node: Additional Configuration Options1167028
-Node: Configuration Philosophy1169017
-Node: Non-Unix Installation1171386
-Node: PC Installation1171846
-Node: PC Binary Installation1172684
-Node: PC Compiling1173119
-Node: PC Using1174236
-Node: Cygwin1177281
-Node: MSYS1178051
-Node: VMS Installation1178552
-Node: VMS Compilation1179343
-Ref: VMS Compilation-Footnote-11180572
-Node: VMS Dynamic Extensions1180630
-Node: VMS Installation Details1182315
-Node: VMS Running1184568
-Node: VMS GNV1188847
-Node: VMS Old Gawk1189582
-Node: Bugs1190053
-Node: Bug address1190716
-Node: Usenet1193508
-Node: Maintainers1194285
-Node: Other Versions1195546
-Node: Installation summary1202308
-Node: Notes1203510
-Node: Compatibility Mode1204375
-Node: Additions1205157
-Node: Accessing The Source1206082
-Node: Adding Code1207519
-Node: New Ports1213738
-Node: Derived Files1218226
-Ref: Derived Files-Footnote-11223872
-Ref: Derived Files-Footnote-21223907
-Ref: Derived Files-Footnote-31224505
-Node: Future Extensions1224619
-Node: Implementation Limitations1225277
-Node: Extension Design1226460
-Node: Old Extension Problems1227614
-Ref: Old Extension Problems-Footnote-11229132
-Node: Extension New Mechanism Goals1229189
-Ref: Extension New Mechanism Goals-Footnote-11232553
-Node: Extension Other Design Decisions1232742
-Node: Extension Future Growth1234855
-Node: Old Extension Mechanism1235691
-Node: Notes summary1237454
-Node: Basic Concepts1238636
-Node: Basic High Level1239317
-Ref: figure-general-flow1239599
-Ref: figure-process-flow1240284
-Ref: Basic High Level-Footnote-11243585
-Node: Basic Data Typing1243770
-Node: Glossary1247098
-Node: Copying1278934
-Node: GNU Free Documentation License1316473
-Node: Index1341591
+Node: Configuration Philosophy1168889
+Node: Non-Unix Installation1171258
+Node: PC Installation1171718
+Node: PC Binary Installation1172556
+Node: PC Compiling1172991
+Node: PC Using1174108
+Node: Cygwin1177153
+Node: MSYS1177923
+Node: VMS Installation1178424
+Node: VMS Compilation1179215
+Ref: VMS Compilation-Footnote-11180444
+Node: VMS Dynamic Extensions1180502
+Node: VMS Installation Details1182187
+Node: VMS Running1184440
+Node: VMS GNV1188719
+Node: VMS Old Gawk1189454
+Node: Bugs1189925
+Node: Bug address1190588
+Node: Usenet1193380
+Node: Maintainers1194157
+Node: Other Versions1195418
+Node: Installation summary1202180
+Node: Notes1203382
+Node: Compatibility Mode1204247
+Node: Additions1205029
+Node: Accessing The Source1205954
+Node: Adding Code1207391
+Node: New Ports1213610
+Node: Derived Files1218098
+Ref: Derived Files-Footnote-11223744
+Ref: Derived Files-Footnote-21223779
+Ref: Derived Files-Footnote-31224377
+Node: Future Extensions1224491
+Node: Implementation Limitations1225149
+Node: Extension Design1226332
+Node: Old Extension Problems1227486
+Ref: Old Extension Problems-Footnote-11229004
+Node: Extension New Mechanism Goals1229061
+Ref: Extension New Mechanism Goals-Footnote-11232425
+Node: Extension Other Design Decisions1232614
+Node: Extension Future Growth1234727
+Node: Old Extension Mechanism1235563
+Node: Notes summary1237326
+Node: Basic Concepts1238508
+Node: Basic High Level1239189
+Ref: figure-general-flow1239471
+Ref: figure-process-flow1240156
+Ref: Basic High Level-Footnote-11243457
+Node: Basic Data Typing1243642
+Node: Glossary1246970
+Node: Copying1278806
+Node: GNU Free Documentation License1316345
+Node: Index1341463

End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 2a0653f8..e958fd18 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -39319,12 +39319,6 @@ MPFR support is not available.
Disable all message-translation facilities.
This is usually not desirable, but it may bring you some slight performance
improvement.
-
-@cindex @option{--with-whiny-user-strftime} configuration option
-@cindex configuration option, @code{--with-whiny-user-strftime}
-@item --with-whiny-user-strftime
-Force use of the included version of the C @code{strftime()}
-function for deficient systems.
@end table
Use the command @samp{./configure --help} to see the full list of
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index df9439df..33cc7d7c 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -38333,12 +38333,6 @@ MPFR support is not available.
Disable all message-translation facilities.
This is usually not desirable, but it may bring you some slight performance
improvement.
-
-@cindex @option{--with-whiny-user-strftime} configuration option
-@cindex configuration option, @code{--with-whiny-user-strftime}
-@item --with-whiny-user-strftime
-Force use of the included version of the C @code{strftime()}
-function for deficient systems.
@end table
Use the command @samp{./configure --help} to see the full list of
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index 871f5e50..8043677a 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -6,6 +6,10 @@
* 4.2.0: Release tar ball made.
+2017-10-13 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkbool.h: Removed.
+
2017-10-08 Arnold D. Robbins <arnold@skeeve.com>
* strncasecmp.c: Fix FSF's address.
diff --git a/missing_d/gawkbool.h b/missing_d/gawkbool.h
deleted file mode 100644
index c75a5a10..00000000
--- a/missing_d/gawkbool.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * gawkbool.h -- replacement definitions for bool.
- */
-
-/*
- * Copyright (C) 2012 the Free Software Foundation, Inc.
- *
- * This file is part of GAWK, the GNU implementation of the
- * AWK Programming Language.
- *
- * GAWK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GAWK is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* This stuff largely taken from the Autoconf doc. */
-
-#ifndef __bool_true_false_are_defined
-# ifndef HAVE__BOOL
-# ifdef __cplusplus
-typedef bool _Bool;
-# else
-# define _Bool signed char
-# endif
-# endif
-# define bool _Bool
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
-#endif
diff --git a/support/ChangeLog b/support/ChangeLog
index d580505f..ac5468dc 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -7,6 +7,8 @@
* intprops.h: Sync with GNULIB.
* regcomp.c (init_word): Move general_case label inside ifdef.
* regex.h: Don't define __USE_GNU. Brings closer to GLIBC regex.
+ * regex.c: Don't include gawkbool.h, we don't use it anymore.
+ * dfa.h: Ditto.
2017-11-26 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/support/dfa.h b/support/dfa.h
index 7d11f05d..79ada1e2 100644
--- a/support/dfa.h
+++ b/support/dfa.h
@@ -19,11 +19,7 @@
/* Written June, 1988 by Mike Haertel */
#include <regex.h>
-#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
-#else
-#include "missing_d/gawkbool.h"
-#endif /* HAVE_STDBOOL_H */
#include <stddef.h>
#if 3 <= __GNUC__
diff --git a/support/regex.c b/support/regex.c
index d3a44851..dc8caf69 100644
--- a/support/regex.c
+++ b/support/regex.c
@@ -69,9 +69,6 @@
#include "regex_internal.h"
#include "regex_internal.c"
-#ifndef HAVE_STDBOOL_H
-#include "missing_d/gawkbool.h"
-#endif
#include "regcomp.c"
#include "regexec.c"