diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2012-02-20 09:06:00 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2012-02-20 09:06:00 +0000 |
| commit | d25bc8fb374083ecf76a36e6de6ae1c488b2fc0d (patch) | |
| tree | 1587a759a18b30dde7057bf6cb26a05412ecbd96 /x11-fm | |
| parent | - Update to 2.14.1.6 (diff) | |
- fix build by not compiling gnu/kfreebsd branches
Reported by: dougb
Notes
Notes:
svn path=/head/; revision=291916
Diffstat (limited to 'x11-fm')
| -rw-r--r-- | x11-fm/xfe/files/patch-xvt_ttyinit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/x11-fm/xfe/files/patch-xvt_ttyinit.c b/x11-fm/xfe/files/patch-xvt_ttyinit.c index ac54a6066d4e..0645ff1fb999 100644 --- a/x11-fm/xfe/files/patch-xvt_ttyinit.c +++ b/x11-fm/xfe/files/patch-xvt_ttyinit.c @@ -1,5 +1,5 @@ --- xvt/ttyinit.c.orig 2010-09-15 16:32:26.000000000 +0200 -+++ xvt/ttyinit.c 2011-11-28 12:45:51.000000000 +0100 ++++ xvt/ttyinit.c 2012-02-20 09:30:28.000000000 +0100 @@ -37,7 +37,12 @@ #include <unistd.h> #include <signal.h> @@ -14,6 +14,15 @@ #include <grp.h> #include <pwd.h> #include <errno.h> +@@ -134,7 +139,7 @@ + #endif /* LINUX */ + + /* GNU KFREEBSD */ +-#if defined (__FreeBSD_kernel__) ++#if defined (__FreeBSD_kernel__) && !defined (__FreeBSD__) + #include <sys/ioctl.h> + #include <pty.h> + #define BSD_PTY @@ -175,7 +180,9 @@ #ifdef BSD_UTMP static int tslot = -1; /* index to our slot in the utmp file */ |