Better Mac fix for GRASS shell. Use global namespace qualifier so tha…

…t system close rather then QWidget::close is linked to. The previous fix left an orphan pty on exit. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9159 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 24, 2008 · 71918a7 · 71918a7
1 parent 1fdb6cb
commit 71918a7
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp
@@ -159,7 +159,7 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools,
   QgsDebugMsg( QString( "master ttyname = %1" ).arg( ttyname( mFdMaster ) ) );
   QgsDebugMsg( QString( "slave ttyname = %1" ).arg( ttyname( fdSlave ) ) );
 
-  //close ( fdSlave ); // -> crash
+  //::close( fdSlave ); // -> crash
 
   // Fork slave and open shell
   int pid = fork();
@@ -176,12 +176,9 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools,
     QgsDebugMsg( "child ->" );
 
     // TODO close all opened file descriptors - close(0)???
-#ifndef Q_OS_DARWIN
-    // Makes child process unusable on Mac
-    close( mFdMaster );
-#endif
+    ::close( mFdMaster );
 
-    //close ( fdSlave ); // -> freeze
+    //::close( fdSlave ); // -> freeze
 
     setsid();
     seteuid( 0 );