diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
| commit | c1bdabf8dd2f22a33fdc35b70b93e871f179445d (patch) | |
| tree | 570e66e842fc556fc643e97aa37e0183ded19f56 /ospf6d/ospf6_area.h | |
| parent | db59fcc9e02b5755a92e4d2913420c1e09e05517 (diff) | |
| parent | 9334b80b2c84f33d0d749b4a172f1d87a77a8544 (diff) | |
| download | quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.bz2 quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.xz | |
Merge branch 'upstream' into hollywood
Conflicts:
ChangeLog
zebra/zebra_rib.c
Diffstat (limited to 'ospf6d/ospf6_area.h')
| -rw-r--r-- | ospf6d/ospf6_area.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ospf6d/ospf6_area.h b/ospf6d/ospf6_area.h index dd33ac47..6bf7e0b5 100644 --- a/ospf6d/ospf6_area.h +++ b/ospf6d/ospf6_area.h @@ -67,9 +67,9 @@ struct ospf6_area { char *name; struct access_list *list; - } export; -#define EXPORT_NAME(A) (A)->export.name -#define EXPORT_LIST(A) (A)->export.list + } _export; +#define EXPORT_NAME(A) (A)->_export.name +#define EXPORT_LIST(A) (A)->_export.list /* Area acceptance list */ struct |