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 /lib/stream.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 'lib/stream.h')
| -rw-r--r-- | lib/stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stream.h b/lib/stream.h index d2d2e401..715a083d 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -137,7 +137,7 @@ struct stream_fifo */ extern struct stream *stream_new (size_t); extern void stream_free (struct stream *); -extern struct stream * stream_copy (struct stream *new, struct stream *src); +extern struct stream * stream_copy (struct stream *, struct stream *src); extern struct stream *stream_dup (struct stream *); extern size_t stream_resize (struct stream *, size_t); extern size_t stream_get_getp (struct stream *); |