Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gawk

3 files changed, 26 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a0e2031..47e562ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* custom.h: Fix non-VMS compilation.
+
+2020-01-26         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* custom.h: Additional OpenVMS typedefs needed.
+	* getext.h: Fix macro for implementations without gettext
+	to not force the result to be a const char *.
+
 2020-01-26         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
 	* array.c (sort_up_value_type): Small efficiency tweak. Only
diff --git a/custom.h b/custom.h
index 787e08bf..ffeb77ea 100644
--- a/custom.h
+++ b/custom.h
@@ -46,16 +46,26 @@
 #undef isnan
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
-#endif
+#endif /* _GNU_SOURCE */
 #ifndef SIZE_MAX
 #define SIZE_MAX __INT32_MAX
-#endif
+#endif /* SIZE_MAX */
+#define ULONG_WIDTH 32
 #ifndef __VAX
 #ifndef ULLONG_MAX
 #define ULLONG_MAX __UINT64_MAX
-#endif
-#endif
-#endif
+#endif /* ULLONG_MAX */
+#endif /* __VAX */
+typedef char int_least8_t;
+typedef unsigned char uint_least8_t;
+typedef short int_least16_t;
+typedef unsigned short uint_least16_t;
+#ifndef __VAX
+typedef long long int_fast64_t;
+typedef unsigned long long uint_fast64_t;
+#endif /* __VAX */
+#endif /* __VMS */
+
 
 /* For QNX, based on submission from Michael Hunter, mphunter@qnx.com */
 #ifdef __QNX__
diff --git a/gettext.h b/gettext.h
index 657fdbe0..aed21b85 100644
--- a/gettext.h
+++ b/gettext.h
@@ -73,7 +73,7 @@
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
 # undef gettext
-# define gettext(Msgid) ((const char *) (Msgid))
+# define gettext(Msgid) ((char *) (Msgid))
 # undef dgettext
 # define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
 # undef dcgettext