Merge branch 'gawk-4.1-stable'

4 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 08557fdd..8e64aeff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-05         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Fixes for Z/OS.
+
+	* custom.h (__attribute__): Define to empty.
+	* dfa.c (parse_bracket_exp): Add a cast to quiet a warning.
+	* regex.c: Correctly bracket include of <sys/param.h>.
+
 2013-12-03         John E. Malmberg	<wb8tyw@qsl.net>
 
 	* io.c (redirect): Add additional VMS error code to check.
diff --git a/custom.h b/custom.h
index 36b4aa0b..211c8003 100644
--- a/custom.h
+++ b/custom.h
@@ -75,4 +75,5 @@
 #define unsetenv zos_unsetenv
 extern int setenv(const char *name, const char *value, int rewrite);
 extern int unsetenv(const char *name);
+#define __attribute__(x)
 #endif
diff --git a/dfa.c b/dfa.c
index f3ea877c..a75d332c 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1054,7 +1054,7 @@ parse_bracket_exp (void)
                   if (MB_CUR_MAX > 1 && !pred->single_byte_only)
                     {
                       /* Store the character class as wctype_t.  */
-                      wctype_t wt = wctype (class);
+                      wctype_t wt = (wctype_t) wctype (class);
 
                       REALLOC_IF_NECESSARY (work_mbc->ch_classes,
                                             ch_classes_al,
diff --git a/regex.c b/regex.c
index 700e7f9d..167d35b2 100644
--- a/regex.c
+++ b/regex.c
@@ -57,9 +57,9 @@
 #include <limits.h>
 
 /* This header defines the MIN and MAX macros.  */
-#ifndef VMS
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
-#endif /* VMS */
+#endif /* HAVE_SYS_PARAM_H */
 
 #ifdef GAWK
 #undef alloca