stdint.h-instead-of-size_max.h.patch from patch #6230.

Include <stdint.h> instead of "size_max.h" to get a definition for
SIZE_MAX.

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 75e22a4840dedc91980d9d5e90d09f4a6cf7bc07..0ddd322bf417a1bb37b19642d76459ca4aa75a8b 100644 (file)
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -42,7 +42,6 @@
 
 #include "c-ctype.h"
 #include "minmax.h"
-#include "size_max.h"
 #include "xalloc.h"
 
 #include "gettext.h"

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 61f8d8bde65200e54e3752bfbb00a881016706e7..6ca829fc5ab7d75d5459c58d1d828436cc5d5c3c 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -18,6 +18,7 @@
 
 #include <ctype.h>
 #include <float.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -48,7 +49,6 @@
 #include <libpspp/str.h>
 #include <output/table.h>
 
-#include "size_max.h"
 #include "xsize.h"
 #include "xalloc.h"
 

diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c
index 12bb43a392745a4db434a1d7185fc5e660f65804..e2b76e7ef37d9a43044476c2d9498bf4400afaaa 100644 (file)
--- a/src/language/data-io/data-reader.c
+++ b/src/language/data-io/data-reader.c
@@ -20,6 +20,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -36,7 +37,6 @@
 #include <libpspp/str.h>
 
 #include "minmax.h"
-#include "size_max.h"
 #include "xalloc.h"
 
 #include "gettext.h"

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index ca69ab25cdf0785851b34c5c8db4c1ca1c26eead..8b3eead83fb41c65ec697b74047a92cf4de44569 100644 (file)
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -16,11 +16,11 @@
 
 #include <config.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "intprops.h"
-#include "size_max.h"
 #include "xmalloca.h"
 
 #include <data/casegrouper.h>

diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c
index b85b9d638c21640cabf58abbb5f59a40320fbf08..35e9a991fafbf9a66478584facea9edad818d6bb 100644 (file)
--- a/src/language/lexer/format-parser.c
+++ b/src/language/lexer/format-parser.c
@@ -19,6 +19,7 @@
 #include "format-parser.h"
 
 #include <ctype.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "lexer.h"
@@ -29,8 +30,6 @@
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 
-#include "size_max.h"
-
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index fb0ddb49679afb087bab9e8a5d296bc827daf596..2af520ac646cd94998708869ec6eecb3e3fa50e4 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -22,6 +22,7 @@
 #include <limits.h>
 #include <math.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <libpspp/assertion.h>
 #include <language/command.h>
@@ -31,7 +32,6 @@
 #include <libpspp/str.h>
 #include <output/journal.h>
 
-#include "size_max.h"
 #include "xalloc.h"
 
 #include "gettext.h"

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index fa33a4461db3d8a8a9d2b6413d4733640846e137..79e5bf6167cb42aeef71137a7fadd98e6000bfe3 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -18,6 +18,7 @@
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -43,7 +44,6 @@
 #include <output/manager.h>
 #include <output/table.h>
 
-#include "size_max.h"
 #include "xalloc.h"
 
 #include "gettext.h"

diff --git a/src/libpspp/pool.c b/src/libpspp/pool.c
index ecf263abcda8ec26324b25bb46b0045cf161e336..88d3535df140e6648f025de4076be66bc466ce06 100644 (file)
--- a/src/libpspp/pool.c
+++ b/src/libpspp/pool.c
@@ -16,12 +16,12 @@
 
 #include <config.h>
 #include "pool.h"
+#include <stdint.h>
 #include <stdlib.h>
 #include <libpspp/assertion.h>
 #include "message.h"
 #include "str.h"
 
-#include "size_max.h"
 #include "xalloc.h"
 
 /* Fast, low-overhead memory block suballocator. */

diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index 13c081dda71e0122d4fac98f2f62053fee4d44e2..6e446f859855ee2ef1b01f4b17f0746ce7f8392a 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -19,14 +19,13 @@
 #include "str.h"
 
 #include <ctype.h>
-#include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include <libpspp/message.h>
 #include <libpspp/pool.h>
 
 #include "minmax.h"
-#include "size_max.h"
 #include "xalloc.h"
 #include "xsize.h"
 \f

diff --git a/src/libpspp/syntax-gen.c b/src/libpspp/syntax-gen.c
index ec2e6b40ff1d7f21524b1f25484f8f7d202037f8..a1cfaf5f8b0ef4dcd5439d9fa4607dd628a97c26 100644 (file)
--- a/src/libpspp/syntax-gen.c
+++ b/src/libpspp/syntax-gen.c
@@ -16,8 +16,8 @@
 
 #include <config.h>
 #include <stdbool.h>
+#include <stdint.h>
 
-#include "size_max.h"
 #include <libpspp/str.h>
 #include <libpspp/assertion.h>
 #include <string.h>

diff --git a/src/output/postscript.c b/src/output/postscript.c
index d4f5b9f3fb4ac94b1a183b78d450d586950864e9..11116b9b6d7a0d3b49db98dda6c7eb455043e5ca 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
@@ -42,7 +43,6 @@
 
 #include "intprops.h"
 #include "minmax.h"
-#include "size_max.h"
 #include "xalloc.h"
 
 #include "gettext.h"