diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.h | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -32,6 +32,9 @@ | |||
32 | - markus@cvs.openbsd.org 2001/11/22 12:34:22 | 32 | - markus@cvs.openbsd.org 2001/11/22 12:34:22 |
33 | [clientloop.c serverloop.c sshd.c] | 33 | [clientloop.c serverloop.c sshd.c] |
34 | volatile sig_atomic_t | 34 | volatile sig_atomic_t |
35 | - stevesk@cvs.openbsd.org 2001/11/29 19:06:39 | ||
36 | [channels.h] | ||
37 | remove dead function prototype; ok markus@ | ||
35 | 38 | ||
36 | 20011126 | 39 | 20011126 |
37 | - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, | 40 | - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, |
@@ -6954,4 +6957,4 @@ | |||
6954 | - Wrote replacements for strlcpy and mkdtemp | 6957 | - Wrote replacements for strlcpy and mkdtemp |
6955 | - Released 1.0pre1 | 6958 | - Released 1.0pre1 |
6956 | 6959 | ||
6957 | $Id: ChangeLog,v 1.1676 2001/12/06 16:48:14 mouring Exp $ | 6960 | $Id: ChangeLog,v 1.1677 2001/12/06 16:49:57 mouring Exp $ |
diff --git a/channels.h b/channels.h index 11ebb7b3a..f58c7283c 100644 --- a/channels.h +++ b/channels.h | |||
@@ -32,7 +32,7 @@ | |||
32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
34 | */ | 34 | */ |
35 | /* RCSID("$OpenBSD: channels.h,v 1.51 2001/11/07 22:53:21 markus Exp $"); */ | 35 | /* RCSID("$OpenBSD: channels.h,v 1.52 2001/11/29 19:06:39 stevesk Exp $"); */ |
36 | 36 | ||
37 | #ifndef CHANNEL_H | 37 | #ifndef CHANNEL_H |
38 | #define CHANNEL_H | 38 | #define CHANNEL_H |
@@ -197,7 +197,6 @@ channel_request_forwarding(const char *, u_short, const char *, u_short, int, | |||
197 | /* x11 forwarding */ | 197 | /* x11 forwarding */ |
198 | 198 | ||
199 | int x11_connect_display(void); | 199 | int x11_connect_display(void); |
200 | char *x11_create_display(int); | ||
201 | char *x11_create_display_inet(int, int); | 200 | char *x11_create_display_inet(int, int); |
202 | void x11_input_open(int, int, void *); | 201 | void x11_input_open(int, int, void *); |
203 | void x11_request_forwarding(void); | 202 | void x11_request_forwarding(void); |