[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok/src/amarokcore
From:       Mark Kretschmann <markey () web ! de>
Date:       2005-02-19 8:29:42
Message-ID: 20050219082942.90E6D1D4C3 () office ! kde ! org
[Download RAW message or body]

CVS commit by markey: 

Fix compile error on Solaris. Variable must not be called "stdout".

BUG: 99703
CCMAIL: amarok-devel@lists.sf.net


  M +3 -3      crashhandler.cpp   1.18


--- kdeextragear-1/amarok/src/amarokcore/crashhandler.cpp  #1.17:1.18
@@ -44,13 +44,13 @@ namespace amaroK
     {
         static const uint SIZE = 40960; //40 KiB
-        static char stdout[ SIZE ];
+        static char stdoutBuf[ SIZE ];
 
         debug() << "Running: " << command << endl;
 
         FILE *process = ::popen( command, "r" );
-        stdout[ std::fread( (void*)stdout, sizeof(char), SIZE-1, process ) ] = '\0';
+        stdoutBuf[ std::fread( (void*)stdoutBuf, sizeof(char), SIZE-1, process ) ] = '\0';
         ::pclose( process );
 
-        return QString::fromLocal8Bit( stdout );
+        return QString::fromLocal8Bit( stdoutBuf );
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]