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

List:       kde-commits
Subject:    branches/extragear/kde3/multimedia/k3b
From:       Hasso Tepper <hasso () kde ! org>
Date:       2007-08-09 12:21:50
Message-ID: 1186662110.226789.24461.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 698154 by hasso:

Fix build in DragonFly BSD.


 M  +1 -1      libk3b/core/k3bglobals.cpp  
 M  +2 -2      src/projects/k3bencodingconverter.cpp  


--- branches/extragear/kde3/multimedia/k3b/libk3b/core/k3bglobals.cpp #698153:698154
@@ -46,7 +46,7 @@
 #include <sys/utsname.h>
 #include <sys/stat.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 #  include <sys/param.h>
 #  include <sys/mount.h>
 #  include <sys/endian.h>
--- branches/extragear/kde3/multimedia/k3b/src/projects/k3bencodingconverter.cpp #698153:698154
@@ -62,7 +62,7 @@
 {
 #ifdef HAVE_ICONV_H
   QCString utf8Encoded( s.length()*2 );
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__)
   const char* in = s.data();
 #else
   char* in = s.data();
@@ -111,7 +111,7 @@
   iconv_t ic = ::iconv_open( to.local8Bit(), from.local8Bit() );
 
   result.resize( s.length() * 2 );
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__)
   const char* in = s.data();
 #else
   char* in = s.data();
[prev in list] [next in list] [prev in thread] [next in thread]