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

List:       kde-commits
Subject:    branches/KDE/3.4/kdemultimedia/kmix
From:       Christian Esken <esken () kde ! org>
Date:       2005-08-24 17:58:37
Message-ID: 1124906317.329726.20650.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 452937 by esken:

Backport:
Resolve two compilation issues for Solaris backend.
1) Wrong destructor
2) Change open() to ::open()


 M  +2 -2      mixer_sun.cpp  


--- branches/KDE/3.4/kdemultimedia/kmix/mixer_sun.cpp #452936:452937
@@ -135,7 +135,7 @@
 // FUNCTION    : Mixer::Mixer
 // DESCRIPTION : Class destructor.
 //======================================================================
-Mixer_SUN::~Mixer_SUN(int devnum) : Mixer_Backend(devnum)
+Mixer_SUN::~Mixer_SUN()
 {
    close();
 }
@@ -159,7 +159,7 @@
    if(audiodev.isNull())
      audiodev = "/dev/audio";
    audiodev += "ctl";
-   if ( ( fd = open( audiodev.data(), O_RDWR ) ) < 0 )
+   if ( ( fd = ::open( audiodev.data(), O_RDWR ) ) < 0 )
    {
       if ( errno == EACCES )
          return Mixer::ERR_PERM;
[prev in list] [next in list] [prev in thread] [next in thread]