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/log.h | |
| 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/log.h')
| -rw-r--r-- | lib/log.h | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,5 +1,9 @@ /* +<<<<<<< HEAD:lib/log.h * $Id: log.h,v 1.20 2008/02/28 23:26:02 paul Exp $ +======= + * $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.h * * Zebra logging funcions. * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro @@ -144,7 +148,11 @@ extern int zlog_rotate (struct zlog *); /* For hackey massage lookup and check */ #define LOOKUP(x, y) mes_lookup(x, x ## _max, y, "(no item found)") +<<<<<<< HEAD:lib/log.h extern const char *lookup (struct message *, int); +======= +extern const char *lookup (const struct message *, int); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.h extern const char *mes_lookup (struct message *meslist, int max, int index, const char *no_item); |