diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-31 10:39:54 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-31 10:39:54 -0700 |
| commit | 2f30d8d38448c7ecde96304e3a94dbb5667b8dcc (patch) | |
| tree | 99831498d4e7cc680592a54d3959894eba173067 /lib/stream.h | |
| parent | f9ca20da1a62324d1ee9c11dd13c71f8986f4909 (diff) | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| download | quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.bz2 quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.xz | |
Merge branch 'upstream' into islavista
Conflicts:
ChangeLog
NEWS
bgpd/ChangeLog
bgpd/bgp_attr.c
bgpd/bgp_network.c
bgpd/bgp_packet.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h
lib/sockopt.c
lib/sockopt.h
lib/zebra.h
mkinstalldirs
zebra/rib.h
zebra/rt_netlink.c
Diffstat (limited to 'lib/stream.h')
| -rw-r--r-- | lib/stream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stream.h b/lib/stream.h index 715a083d..3e4ba7b4 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -150,7 +150,7 @@ extern void stream_forward_getp (struct stream *, size_t); extern void stream_forward_endp (struct stream *, size_t); /* steam_put: NULL source zeroes out size_t bytes of stream */ -extern void stream_put (struct stream *, void *, size_t); +extern void stream_put (struct stream *, const void *, size_t); extern int stream_putc (struct stream *, u_char); extern int stream_putc_at (struct stream *, size_t, u_char); extern int stream_putw (struct stream *, u_int16_t); @@ -200,7 +200,7 @@ extern ssize_t stream_recvmsg (struct stream *s, int fd, struct msghdr *, extern ssize_t stream_recvfrom (struct stream *s, int fd, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); -extern size_t stream_write (struct stream *, u_char *, size_t); +extern size_t stream_write (struct stream *, const void *, size_t); /* reset the stream. See Note above */ extern void stream_reset (struct stream *); |