aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2013-12-07 19:05:03 +0200
committerArnold D. Robbins <arnold@skeeve.com>2013-12-07 19:05:03 +0200
commitc0c2b9f5571b9c01e7fd3dd7553ecb9a3870756b (patch)
treee43c63c1c46ab05b9fd3987fd23222251c47cb09
parent70c5bdd817c0dc7cbdd95f9e2c04639ffecb1e61 (diff)
downloadegawk-c0c2b9f5571b9c01e7fd3dd7553ecb9a3870756b.tar.gz
egawk-c0c2b9f5571b9c01e7fd3dd7553ecb9a3870756b.tar.bz2
egawk-c0c2b9f5571b9c01e7fd3dd7553ecb9a3870756b.zip
Further compilation fixes, VMS and Z/OS.
-rw-r--r--ChangeLog6
-rw-r--r--custom.h1
-rw-r--r--regex_internal.h1
-rw-r--r--vms/ChangeLog5
-rw-r--r--vms/vms-conf.h2
5 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 48dd8a43..a8d59898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-07 Arnold D. Robbins <arnold@skeeve.com>
+
+ * regex_internal.h (__attribute__): Define to empty if not GCC.
+ * custom.h (__attribute__): Remove the definition from here; the
+ right place was regex_internal.h.
+
2013-12-06 Arnold D. Robbins <arnold@skeeve.com>
No need to generate version.c from version.in.
diff --git a/custom.h b/custom.h
index 211c8003..36b4aa0b 100644
--- a/custom.h
+++ b/custom.h
@@ -75,5 +75,4 @@
#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/regex_internal.h b/regex_internal.h
index 45a69655..448e32ea 100644
--- a/regex_internal.h
+++ b/regex_internal.h
@@ -155,6 +155,7 @@ is_blank (int c)
# define __attribute(arg) __attribute__ (arg)
#else
# define __attribute(arg)
+# define __attribute__(arg) /* GAWK: They left this out. Duh. */
#endif
#ifdef GAWK
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 18d70b5c..f8344654 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-06 Arnold D. Robbins <arnold@skeeve.com>
+
+ * vms-conf.h (__attribute__): Removed definition from here; fixed
+ the issue in the main sources.
+
2013-12-01 Arnold D. Robbins <arnold@skeeve.com>
* vms-conf.h (ALLOW_SWITCH): Removed. No longer used.
diff --git a/vms/vms-conf.h b/vms/vms-conf.h
index 60464f06..575b5de6 100644
--- a/vms/vms-conf.h
+++ b/vms/vms-conf.h
@@ -673,8 +673,6 @@
#include "vms/redirect.h"
#undef IN_CONFIG_H
-#define __attribute__(x)
-
#endif /*"custom.h"*/
#endif /*CONFIG_H*/