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

List:       kde-commits
Subject:    KDE/kdemultimedia/kioslave/audiocd
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2008-09-25 15:36:57
Message-ID: 1222357017.448952.25864.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 864818 by ogoffart:

Compile



 M  +3 -0      audiocd.cpp  
 M  +3 -0      plugins/wav/encodercda.cpp  


--- trunk/KDE/kdemultimedia/kioslave/audiocd/audiocd.cpp #864817:864818
@@ -27,8 +27,11 @@
 #include <kdemacros.h>
 extern "C"
 {
+	//cdda_interface.h in cdparanoia 10.2 has a member called 'private' which \
the C++ compiler doesn't like +	#define private _private   
 	#include <cdda_interface.h>
 	#include <cdda_paranoia.h>
+	#undef private
 	void paranoiaCallback(long, int);
 
 	KDE_EXPORT int kdemain(int argc, char ** argv);
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/wav/encodercda.cpp \
#864817:864818 @@ -42,7 +42,10 @@
 // Remove this by calculating CD_FRAMESIZE_RAW from the frames
 extern "C"
 {
+  //cdda_interface.h in cdparanoia 10.2 has a member called 'private' \
which the C++ compiler doesn't like +  #define private _private
   #include <cdda_interface.h>
+  #undef private
 }
 
 inline int16_t swap16 (int16_t i)


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