[QGIS Commit] r10668 - trunk/qgis/src/plugins/grass/qtermwidget

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-04-27 19:42:46 -0400 (Mon, 27 Apr 2009)
New Revision: 10668

Modified:
   trunk/qgis/src/plugins/grass/qtermwidget/k3process.cpp
   trunk/qgis/src/plugins/grass/qtermwidget/kpty.cpp
   trunk/qgis/src/plugins/grass/qtermwidget/kpty.h
Log:
quick fix to get grass shell built on mac

Modified: trunk/qgis/src/plugins/grass/qtermwidget/k3process.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/k3process.cpp	2009-04-27 15:46:57 UTC (rev 10667)
+++ trunk/qgis/src/plugins/grass/qtermwidget/k3process.cpp	2009-04-27 23:42:46 UTC (rev 10668)
@@ -636,8 +636,10 @@
 bool K3Process::closePty()
 {
   if (d->pty && d->pty->masterFd() >= 0) {
+#ifndef Q_OS_MAC
     if (d->addUtmp)
       d->pty->logout();
+#endif
     d->pty->close();
     return true;
   } else
@@ -948,8 +950,10 @@
   // PTY stuff //
   if (d->usePty) {
     d->pty->setCTty();
+#ifndef Q_OS_MAC
     if (d->addUtmp)
       d->pty->login(getenv("USER"), getenv("DISPLAY"));
+#endif
   }
 
   return ok;

Modified: trunk/qgis/src/plugins/grass/qtermwidget/kpty.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/kpty.cpp	2009-04-27 15:46:57 UTC (rev 10667)
+++ trunk/qgis/src/plugins/grass/qtermwidget/kpty.cpp	2009-04-27 23:42:46 UTC (rev 10668)
@@ -417,6 +417,7 @@
 #endif
 }
 
+#ifndef Q_OS_MAC
 void KPty::login(const char *user, const char *remotehost)
 {
 #ifdef HAVE_UTEMPTER
@@ -561,6 +562,7 @@
 # endif
 #endif
 }
+#endif
 
 // XXX Supposedly, tc[gs]etattr do not work with the master on Solaris.
 // Please verify.

Modified: trunk/qgis/src/plugins/grass/qtermwidget/kpty.h
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/kpty.h	2009-04-27 15:46:57 UTC (rev 10667)
+++ trunk/qgis/src/plugins/grass/qtermwidget/kpty.h	2009-04-27 23:42:46 UTC (rev 10668)
@@ -82,6 +82,7 @@
    */
   void setCTty();
 
+#ifndef Q_OS_MAC
   /**
    * Creates an utmp entry for the tty.
    * This function must be called after calling setCTty and
@@ -98,6 +99,7 @@
    * Removes the utmp entry for this tty.
    */
   void logout();
+#endif
 
   /**
    * Wrapper around tcgetattr(3).