projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We've had a mix of min, max from libpspp/misc.h and MIN, MAX from
[pspp-builds.git]
/
src
/
language
/
data-io
/
matrix-data.c
diff --git
a/src/language/data-io/matrix-data.c
b/src/language/data-io/matrix-data.c
index 6283279cad6effec032a93da06998a486af1e3be..88cae91f450c7abfa77f463d5276026db1bdc547 100644
(file)
--- a/
src/language/data-io/matrix-data.c
+++ b/
src/language/data-io/matrix-data.c
@@
-44,6
+44,7
@@
#include <libpspp/pool.h>
#include <libpspp/str.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "minmax.h"
#include "size_max.h"
#include "gettext.h"
#include "size_max.h"
#include "gettext.h"
@@
-1737,8
+1738,8
@@
wr_read_rowtype (struct wr_aux_data *wr,
char s[16];
char *cp;
char s[16];
char *cp;
- memcpy (s, token->string,
min
(15, token->length));
- s[
min
(15, token->length)] = 0;
+ memcpy (s, token->string,
MIN
(15, token->length));
+ s[
MIN
(15, token->length)] = 0;
for (cp = s; *cp; cp++)
*cp = toupper ((unsigned char) *cp);
for (cp = s; *cp; cp++)
*cp = toupper ((unsigned char) *cp);