Mercurial > octave-nkf

changeset 20310:92c0fead20da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* kpty_p.h, kpty.cpp (KPtyPrivate::chownpty): Define unconditionally.
author John W. Eaton <jwe@octave.org>
date Wed, 24 Jun 2015 11:47:14 -0400
parents 140ce5e857bf
children 396e9cd6cd98
files libgui/qterminal/libqterminal/unix/kpty.cpp libgui/qterminal/libqterminal/unix/kpty_p.h
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/kpty.cpp	Tue Jun 23 20:00:59 2015 -0700
+++ b/libgui/qterminal/libqterminal/unix/kpty.cpp	Wed Jun 24 11:47:14 2015 -0400
@@ -176,14 +176,12 @@
 {
 }
 
-#ifndef HAVE_OPENPTY
 bool KPtyPrivate::chownpty(bool)
 {
 //    return !QProcess::execute(KStandardDirs::findExe("kgrantpty"),
 //        QStringList() << (grant?"--grant":"--revoke") << QString::number(masterFd));
     return true;
 }
-#endif
 
 /////////////////////////////
 // public member functions //
--- a/libgui/qterminal/libqterminal/unix/kpty_p.h	Tue Jun 23 20:00:59 2015 -0700
+++ b/libgui/qterminal/libqterminal/unix/kpty_p.h	Wed Jun 24 11:47:14 2015 -0400
@@ -34,9 +34,8 @@
     KPtyPrivate(KPty* parent, int masterFd, int slaveFd);
 
     virtual ~KPtyPrivate();
-#ifndef HAVE_OPENPTY
+
     bool chownpty(bool grant);
-#endif
 
     int masterFd;
     int slaveFd;