#include <output/output.h>
#include <output/table.h>
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
int i;
for (p = max; *p; p++)
- t->w[p - max] = min (tab_natural_width (t, d, p - max),
+ t->w[p - max] = MIN (tab_natural_width (t, d, p - max),
*p * d->prop_em_width);
for (i = 0; i < t->nr; i++)
t->h[i] = tab_natural_height (t, d, i);
if (r + 10 + nvl > nr)
{
- nr = max (nr * dict_get_var_cnt (d) / (i + 1), nr);
+ nr = MAX (nr * dict_get_var_cnt (d) / (i + 1), nr);
nr += 10 + nvl;
tab_realloc (t, 4, nr);
}
sorted = lex_match_id (lexer, "SORTED");
for (cp = sbc; *cp; cp++)
- if (lex_token (lexer) == T_ID && lex_id_match (*cp, lex_tokid (lexer)))
+ if (lex_token (lexer) == T_ID
+ && lex_id_match (ss_cstr (*cp), ss_cstr (lex_tokid (lexer))))
{
lex_get (lexer);
break;
t->w[0] = tab_natural_width (t, d, 0);
if (_as == AS_DICTIONARY || _as == AS_VARIABLES || _as == AS_LABELS)
{
- t->w[1] = max (tab_natural_width (t, d, 1), d->prop_em_width * 5);
- t->w[2] = max (tab_natural_width (t, d, 2), d->prop_em_width * 35);
+ t->w[1] = MAX (tab_natural_width (t, d, 1), d->prop_em_width * 5);
+ t->w[2] = MAX (tab_natural_width (t, d, 2), d->prop_em_width * 35);
pc = 3;
}
else pc = 1;
if (r + 10 + nvl > nr)
{
- nr = max (nr * n / (i + 1), nr);
+ nr = MAX (nr * n / (i + 1), nr);
nr += 10 + nvl;
tab_realloc (t, nc, nr);
}