summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-21 03:07:27 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-21 03:07:27 +0000
commit83417a86da30b1db7acfd0650e33bcfd8f31b968 (patch)
tree3579662a93b41e609d54c4ca3abb17971b22e094
parent352b1c2130cec67ec09401f297dff461f6a2f623 (diff)
- markus@cvs.openbsd.org 2001/06/16 08:50:39
[channels.h] bad //-style comment; thx to stevev@darkwing.uoregon.edu
-rw-r--r--ChangeLog5
-rw-r--r--channels.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c6e386e5d..23e9106f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - markus@cvs.openbsd.org 2001/06/16 08:49:38 3 - markus@cvs.openbsd.org 2001/06/16 08:49:38
4 [misc.c] 4 [misc.c]
5 typo; dunlap@apl.washington.edu 5 typo; dunlap@apl.washington.edu
6 - markus@cvs.openbsd.org 2001/06/16 08:50:39
7 [channels.h]
8 bad //-style comment; thx to stevev@darkwing.uoregon.edu
6 9
720010615 1020010615
8 - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL 11 - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
@@ -5655,4 +5658,4 @@
5655 - Wrote replacements for strlcpy and mkdtemp 5658 - Wrote replacements for strlcpy and mkdtemp
5656 - Released 1.0pre1 5659 - Released 1.0pre1
5657 5660
5658$Id: ChangeLog,v 1.1289 2001/06/21 03:04:37 mouring Exp $ 5661$Id: ChangeLog,v 1.1290 2001/06/21 03:07:27 mouring Exp $
diff --git a/channels.h b/channels.h
index 3de9627ab..53c914e0f 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.37 2001/06/04 21:59:42 markus Exp $"); */ 35/* RCSID("$OpenBSD: channels.h,v 1.38 2001/06/16 08:50:39 markus Exp $"); */
36 36
37#ifndef CHANNEL_H 37#ifndef CHANNEL_H
38#define CHANNEL_H 38#define CHANNEL_H
@@ -209,7 +209,6 @@ int channel_connect_by_listen_adress(u_short listen_port);
209/* x11 forwarding */ 209/* x11 forwarding */
210 210
211int x11_connect_display(void); 211int x11_connect_display(void);
212//int x11_check_cookie(Buffer *b);
213char *x11_create_display(int screen); 212char *x11_create_display(int screen);
214char *x11_create_display_inet(int screen, int x11_display_offset); 213char *x11_create_display_inet(int screen, int x11_display_offset);
215void x11_input_open(int type, int plen, void *ctxt); 214void x11_input_open(int type, int plen, void *ctxt);