quick fix to get grass shell built on mac

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10668 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 27, 2009 · df56940 · df56940
1 parent 0e6cca3
commit df56940
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/plugins/grass/qtermwidget/k3process.cpp b/src/plugins/grass/qtermwidget/k3process.cpp
@@ -636,8 +636,10 @@ bool K3Process::closeStderr()
 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 @@ int K3Process::commSetupDoneC()
   // 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;

diff --git a/src/plugins/grass/qtermwidget/kpty.cpp b/src/plugins/grass/qtermwidget/kpty.cpp
@@ -417,6 +417,7 @@ void KPty::setCTty()
 #endif
 }
 
+#ifndef Q_OS_MAC
 void KPty::login(const char *user, const char *remotehost)
 {
 #ifdef HAVE_UTEMPTER
@@ -561,6 +562,7 @@ void KPty::logout()
 # endif
 #endif
 }
+#endif
 
 // XXX Supposedly, tc[gs]etattr do not work with the master on Solaris.
 // Please verify.

diff --git a/src/plugins/grass/qtermwidget/kpty.h b/src/plugins/grass/qtermwidget/kpty.h
@@ -82,6 +82,7 @@ class KPty {
    */
   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 @@ class KPty {
    * Removes the utmp entry for this tty.
    */
   void logout();
+#endif
 
   /**
    * Wrapper around tcgetattr(3).