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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-01-01 9:11:01
Message-ID: 1136106661.173368.22880.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 493017 by amantia:

Use the system's byteswap.h if available, otherwise it fails with a compiler error on \
AMD64:

In file included from \
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/libisofs/iso_fs.h:6,
                
                 from \
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/libisofs/isofs.h:23,
                
                 from \
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/k3biso9660.cpp:21:
                
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/libisofs/bswap.h:26:5: \
                warning: "__CPU__" is not defined
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/libisofs/bswap.h: \
                In function ‘long long unsigned int ByteSwap64(long long unsigned \
                int)':
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/libisofs/bswap.h:45: \
                warning: subscripting array declared ‘register'
/data/development/sources/kde-3.5/extragear/multimedia/k3b/libk3b/tools/libisofs/bswap.h:45: \
warning: subscripting array declared ‘register' {standard input}: Assembler \
messages: {standard input}:1138: Error: suffix or operands invalid for `xchg'

There is another error in the imported growisofs as well, so it still doesn't \
compile.

CCMAIL: sebastian@trueg.de

 M  +6 -4      metabundle.h  


--- trunk/extragear/multimedia/amarok/src/metabundle.h #493016:493017
@@ -13,6 +13,8 @@
 #include <klocale.h> //inline functions
 #include <taglib/audioproperties.h>
 
+#include "amarok_export.h"
+
 class KFileMetaInfo;
 class PlaylistItem;
 template<class T> class QValueList;
@@ -43,7 +45,7 @@
     /**
      * Creates an empty MetaBundle
      */
-    MetaBundle()
+    LIBAMAROK_EXPORT MetaBundle()
             : m_isValidMedia( false )
     {
         init();
@@ -52,10 +54,10 @@
     /**
      * Creates a MetaBundle for url, tags will be obtained and set
      */
-    explicit MetaBundle( const KURL&, bool noCache = false, \
TagLib::AudioProperties::ReadStyle = TagLib::AudioProperties::Fast ); +    \
LIBAMAROK_EXPORT explicit MetaBundle( const KURL&, bool noCache = false, \
TagLib::AudioProperties::ReadStyle = TagLib::AudioProperties::Fast );  
     /** For the StreamProvider */
-    MetaBundle( const QString &title,
+    LIBAMAROK_EXPORT MetaBundle( const QString &title,
             const QString &streamUrl,
             const int bitrate,
             const QString &genre,
@@ -63,7 +65,7 @@
             const KURL &url );
 
     /** For PlaylistItems */
-    MetaBundle( const PlaylistItem *item );
+    LIBAMAROK_EXPORT MetaBundle( const PlaylistItem *item );
 
     bool operator==( const MetaBundle& bundle );
     inline bool operator!=( const MetaBundle& bundle ) { return !operator==( bundle \
); }


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