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.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/log.c')
| -rw-r--r-- | lib/log.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,9 @@ /* +<<<<<<< HEAD:lib/log.c * $Id: log.c,v 1.34 2008/02/28 23:26:02 paul Exp $ +======= + * $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.c * * Logging of zebra * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro @@ -30,6 +34,10 @@ #ifndef SUNOS_5 #include <sys/un.h> #endif +/* for printstack on solaris */ +#ifdef HAVE_UCONTEXT_H +#include <ucontext.h> +#endif static int logfile_fd = -1; /* Used in signal handler. */ @@ -740,9 +748,9 @@ zlog_rotate (struct zlog *zl) /* Message lookup function. */ const char * -lookup (struct message *mes, int key) +lookup (const struct message *mes, int key) { - struct message *pnt; + const struct message *pnt; for (pnt = mes; pnt->key != 0; pnt++) if (pnt->key == key) |