summaryrefslogtreecommitdiffstats
path: root/lib/hash.h
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-13 12:12:33 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-13 12:12:33 -0700
commitd3e384e4f00aa90db4310f82f3cbe6528e256334 (patch)
tree716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /lib/hash.h
parentd0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff)
parent41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff)
downloadquagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2
quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'lib/hash.h')
-rw-r--r--lib/hash.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/hash.h b/lib/hash.h
index a6e3d59a..f4b1c23e 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -48,16 +48,16 @@ struct hash
unsigned int (*hash_key) (void *);
/* Data compare function. */
- int (*hash_cmp) (void *, void *);
+ int (*hash_cmp) (const void *, const void *);
/* Backet alloc. */
unsigned long count;
};
extern struct hash *hash_create (unsigned int (*) (void *),
- int (*) (void *, void *));
+ int (*) (const void *, const void *));
extern struct hash *hash_create_size (unsigned int, unsigned int (*) (void *),
- int (*) (void *, void *));
+ int (*) (const void *, const void *));
extern void *hash_get (struct hash *, void *, void * (*) (void *));
extern void *hash_alloc_intern (void *);