projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed make distcheck
[pspp]
/
src
/
data
/
variable.c
diff --git
a/src/data/variable.c
b/src/data/variable.c
index 7a631a73650e132a00752ffb72755e6d3525c91a..ca302415d22799c4a8547dd398ad601802b3fea3 100644
(file)
--- a/
src/data/variable.c
+++ b/
src/data/variable.c
@@
-31,6
+31,8
@@
#include <libpspp/str.h>
#include "value-labels.h"
#include <libpspp/str.h>
#include "value-labels.h"
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-106,7
+108,7
@@
compare_values (const union value *a, const union value *b, int width)
if (width == 0)
return a->f < b->f ? -1 : a->f > b->f;
else
if (width == 0)
return a->f < b->f ? -1 : a->f > b->f;
else
- return memcmp (a->s, b->s,
min
(MAX_SHORT_STRING, width));
+ return memcmp (a->s, b->s,
MIN
(MAX_SHORT_STRING, width));
}
/* Create a hash of v */
}
/* Create a hash of v */
@@
-118,7
+120,7
@@
hash_value(const union value *v, int width)
if ( 0 == width )
id_hash = hsh_hash_double (v->f);
else
if ( 0 == width )
id_hash = hsh_hash_double (v->f);
else
- id_hash = hsh_hash_bytes (v->s,
min
(MAX_SHORT_STRING, width));
+ id_hash = hsh_hash_bytes (v->s,
MIN
(MAX_SHORT_STRING, width));
return id_hash;
}
return id_hash;
}
@@
-216,7
+218,7
@@
var_is_plausible_name (const char *name, bool issue_error)
/* A hsh_compare_func that orders variables A and B by their
names. */
int
/* A hsh_compare_func that orders variables A and B by their
names. */
int
-compare_var_names (const void *a_, const void *b_,
void *foo
UNUSED)
+compare_var_names (const void *a_, const void *b_,
const void *aux
UNUSED)
{
const struct variable *a = a_;
const struct variable *b = b_;
{
const struct variable *a = a_;
const struct variable *b = b_;
@@
-226,7
+228,7
@@
compare_var_names (const void *a_, const void *b_, void *foo UNUSED)
/* A hsh_hash_func that hashes variable V based on its name. */
unsigned
/* A hsh_hash_func that hashes variable V based on its name. */
unsigned
-hash_var_name (const void *v_,
void *foo
UNUSED)
+hash_var_name (const void *v_,
const void *aux
UNUSED)
{
const struct variable *v = v_;
{
const struct variable *v = v_;
@@
-236,7
+238,7
@@
hash_var_name (const void *v_, void *foo UNUSED)
/* A hsh_compare_func that orders pointers to variables A and B
by their names. */
int
/* A hsh_compare_func that orders pointers to variables A and B
by their names. */
int
-compare_var_ptr_names (const void *a_, const void *b_,
void *foo
UNUSED)
+compare_var_ptr_names (const void *a_, const void *b_,
const void *aux
UNUSED)
{
struct variable *const *a = a_;
struct variable *const *b = b_;
{
struct variable *const *a = a_;
struct variable *const *b = b_;
@@
-247,7
+249,7
@@
compare_var_ptr_names (const void *a_, const void *b_, void *foo UNUSED)
/* A hsh_hash_func that hashes pointer to variable V based on its
name. */
unsigned
/* A hsh_hash_func that hashes pointer to variable V based on its
name. */
unsigned
-hash_var_ptr_name (const void *v_,
void *foo
UNUSED)
+hash_var_ptr_name (const void *v_,
const void *aux
UNUSED)
{
struct variable *const *v = v_;
{
struct variable *const *v = v_;