summaryrefslogtreecommitdiffstats
path: root/lib/distribute.c
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/distribute.c
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/distribute.c')
-rw-r--r--lib/distribute.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/distribute.c b/lib/distribute.c
index 3d616211..906e3f6d 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -134,7 +134,7 @@ distribute_hash_make (struct distribute *dist)
/* If two distribute-list have same value then return 1 else return
0. This function is used by hash package. */
static int
-distribute_cmp (struct distribute *dist1, struct distribute *dist2)
+distribute_cmp (const struct distribute *dist1, const struct distribute *dist2)
{
if (dist1->ifname && dist2->ifname)
if (strcmp (dist1->ifname, dist2->ifname) == 0)
@@ -769,7 +769,7 @@ void
distribute_list_init (int node)
{
disthash = hash_create ((unsigned int (*) (void *)) distribute_hash_make,
- (int (*) (void *, void *)) distribute_cmp);
+ (int (*) (const void *, const void *)) distribute_cmp);
if(node==RIP_NODE) {
install_element (RIP_NODE, &distribute_list_all_cmd);