summaryrefslogtreecommitdiff
path: root/devel/rlwrap/files/patch-src::ptytty.c
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2010-01-27 13:01:11 +0000
committerMartin Wilke <miwi@FreeBSD.org>2010-01-27 13:01:11 +0000
commit64c14acd76f55988c093d7335428eaaa48e393e0 (patch)
tree87398d4833dfb41a234147a00fdd6faa58737c9c /devel/rlwrap/files/patch-src::ptytty.c
parent- Update to 0.13.0 (diff)
- Update to 0.36
PR: 143202 Submitted by: Rob Farmer <rfarmer@predatorlabs.net> Approved by: maintainer
Notes
Notes: svn path=/head/; revision=248675
Diffstat (limited to 'devel/rlwrap/files/patch-src::ptytty.c')
-rw-r--r--devel/rlwrap/files/patch-src::ptytty.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/devel/rlwrap/files/patch-src::ptytty.c b/devel/rlwrap/files/patch-src::ptytty.c
index f8b1c0d69474..adc2ed43cd46 100644
--- a/devel/rlwrap/files/patch-src::ptytty.c
+++ b/devel/rlwrap/files/patch-src::ptytty.c
@@ -1,12 +1,12 @@
---- src/ptytty.c.orig 2005-10-17 09:36:46.000000000 +0200
-+++ src/ptytty.c 2007-09-27 14:12:26.000000000 +0200
+--- src/ptytty.c.orig 2010-01-24 01:05:53.000000000 -0800
++++ src/ptytty.c 2010-01-24 01:09:19.000000000 -0800
@@ -41,7 +41,7 @@
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
-#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
+#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) && !defined(__FreeBSD__)
- # include <sys/stropts.h> /* for I_PUSH */
+ # include <sys/stropts.h> /* for I_PUSH */
#endif
@@ -159,11 +159,19 @@
@@ -14,10 +14,10 @@
char tty_name[] = "/dev/tty??";
-# ifndef PTYCHAR1
--# define PTYCHAR1 "pqrstuvwxyz"
+-# define PTYCHAR1 "pqrstuvwxyz"
-# endif
-# ifndef PTYCHAR2
--# define PTYCHAR2 "0123456789abcdef"
+-# define PTYCHAR2 "0123456789abcdef"
+# ifdef __FreeBSD__
+/* Auto-detected pty names do not work well with devfs! */
+# undef PTYCHAR1