aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--custom.h2
-rw-r--r--support/ChangeLog5
-rw-r--r--support/dfa.c5
-rw-r--r--vms/ChangeLog6
-rwxr-xr-x[-rw-r--r--]vms/generate_config_vms_h_gawk.com8
6 files changed, 24 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1338479c..17d4595a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-04 John E. Malmberg <wb8tyw@qsl.net>
+
+ * custom.h: Fix OpenVMS SIZE_MAX value.
+
2020-02-01 Arnold D. Robbins <arnold@skeeve.com>
* awk.h, dfa.c: Move include of mbsupport.h to ...
diff --git a/custom.h b/custom.h
index d2e11eae..66e755de 100644
--- a/custom.h
+++ b/custom.h
@@ -48,7 +48,7 @@
#define _GNU_SOURCE 1
#endif /* _GNU_SOURCE */
#ifndef SIZE_MAX
-#define SIZE_MAX __INT32_MAX
+#define SIZE_MAX (__UINT32_MAX)
#endif /* SIZE_MAX */
#define ULONG_WIDTH 32
#ifndef __VAX
diff --git a/support/ChangeLog b/support/ChangeLog
index 202f9f02..96da5cb4 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-01 John E. Malmberg <wb8tyw@qsl.net>
+
+ * dfa.c: Remove OpenVMS specific code. OpenVMS build
+ will generate a stdint.h if needed.
+
2020-02-01 Arnold D. Robbins <arnold@skeeve.com>
* dfa.c: Update from GNULIB. Should help Vax/VMS.
diff --git a/support/dfa.c b/support/dfa.c
index d112443f..9939d228 100644
--- a/support/dfa.c
+++ b/support/dfa.c
@@ -28,12 +28,7 @@
#include <assert.h>
#include <ctype.h>
-#ifndef VMS
#include <stdint.h>
-#else
-#define SIZE_MAX __INT32_MAX
-#define PTRDIFF_MAX __INT32_MAX
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 3f632fe1..bfad7907 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-04 John E. Malmberg <wb8tyw@qsl.net>
+
+ * generate_config_vms_h_gawk.com:
+ Create stdint.h if not supplied by OpenVMS and
+ add in the definitions required by support/dfa.h
+
2020-02-03 John E. Malmberg <wb8tyw@qsl.net>
* vmstest.com: Fix some issues where a test failure would stop the
diff --git a/vms/generate_config_vms_h_gawk.com b/vms/generate_config_vms_h_gawk.com
index b0d1ed1b..681a73b1 100644..100755
--- a/vms/generate_config_vms_h_gawk.com
+++ b/vms/generate_config_vms_h_gawk.com
@@ -67,6 +67,14 @@ $ then
$ create sys$disk:[]stdint.h
$ open/append stdint_h sys$disk:[]stdint.h
$ write stdint_h "/* Fake stdint.h for gnulib */"
+$ write stdint_h "#ifndef FAKE_STDINT"
+$ write stdint_h "#define FAKE_STDINT"
+$ write stdint_h "#include <fake_vms_path/limits.h>"
+$ write stdint_h "#define PTRDIFF_MAX (__INT32_MAX)"
+$ write stdint_h "#ifndef SIZE_MAX"
+$ write stdint_h "#define SIZE_MAX (__UINT32_MAX)"
+$ write stdint_h "#endif /* __VAX */"
+$ write stdint_h "#endif /* FAKE_STDINT */"
$ close stdint_h
$ endif
$!