diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:00:46 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:30:17 +0100 |
| commit | f4b356490dc03d3758b50da11b1548254fb56138 (patch) | |
| tree | ead2e56720973f2f1c7eebe0ae032f2c826bc328 /lib/stream.h | |
| parent | 7d5fe54553c735a12e3fc40c3d9f0e59c79a33c6 (diff) | |
| parent | 2442cdc3064f87860972ce6397fbaab52e200a00 (diff) | |
| download | quagga-f4b356490dc03d3758b50da11b1548254fb56138.tar.bz2 quagga-f4b356490dc03d3758b50da11b1548254fb56138.tar.xz | |
Merge branch 'patches/sh_bgp-write-cork' into dn42
Conflicts:
lib/sockunion.c
Diffstat (limited to 'lib/stream.h')
| -rw-r--r-- | lib/stream.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/stream.h b/lib/stream.h index 3e4ba7b4..486a3f93 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -181,10 +181,6 @@ extern u_int32_t stream_get_ipv4 (struct stream *); Use stream_read_try instead. */ extern int stream_read (struct stream *, int, size_t); -/* Deprecated: all file descriptors should already be non-blocking. - Will be removed. Use stream_read_try instead. */ -extern int stream_read_unblock (struct stream *, int, size_t); - /* Read up to size bytes into the stream. Return code: >0: number of bytes read |