diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /lib/filter.c | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-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/filter.c')
| -rw-r--r-- | lib/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/filter.c b/lib/filter.c index 069919bb..7aeb8deb 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -138,7 +138,7 @@ filter_free (struct filter *filter) } /* Return string of filter_type. */ -const static char * +static const char * filter_type_str (struct filter *filter) { switch (filter->type) |