diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 19:20:12 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 19:20:12 +0100 |
| commit | 7df2e1c3797df638016ae6d7a34e1781c0f1ced5 (patch) | |
| tree | 2c7aa125a2e684ce5e2d91b37e4fc1e4dab7b024 /watchfrr | |
| parent | Merge pull request #174 from LabNConsulting/working/master/patch-set/issue-172 (diff) | |
| parent | Merge pull request #176 from opensourcerouting/mtype-underflow-backtrace (diff) | |
| download | frr-7df2e1c3797df638016ae6d7a34e1781c0f1ced5.tar.xz frr-7df2e1c3797df638016ae6d7a34e1781c0f1ced5.zip | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'watchfrr')
| -rw-r--r-- | watchfrr/Makefile.am | 2 | ||||
| -rw-r--r-- | watchfrr/watchfrr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/watchfrr/Makefile.am b/watchfrr/Makefile.am index 51851b016..abe2266f2 100644 --- a/watchfrr/Makefile.am +++ b/watchfrr/Makefile.am @@ -10,4 +10,4 @@ sbin_PROGRAMS = watchfrr noinst_HEADERS = watchfrr.h watchfrr_SOURCES = watchfrr.c watchfrr_vty.c -watchfrr_LDADD = ../lib/libzebra.la @LIBCAP@ +watchfrr_LDADD = ../lib/libfrr.la @LIBCAP@ diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 122d6db6d..f61dd3858 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -62,7 +62,7 @@ #define PING_TOKEN "PING" -/* Needs to be global, referenced somewhere inside libzebra. */ +/* Needs to be global, referenced somewhere inside libfrr. */ struct thread_master *master; typedef enum { |