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

List:       kde-commits
Subject:    branches/work/phonon-xine-with-engine-per-stream
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-07-16 15:32:22
Message-ID: 1216222342.808475.20045.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 833283 by mkretz:

forwardport off_t changes from trunk

 M  +0 -3      CMakeLists.txt  
 M  +5 -2      bytestream.h  


--- branches/work/phonon-xine-with-engine-per-stream/CMakeLists.txt #833282:833283
@@ -30,9 +30,6 @@
 
 add_subdirectory(kcm)
 
-# xine expects off_t to be 64bits
-ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
-
 set(phonon_xine_PART_SRCS
    sinknode.cpp
    sourcenode.cpp
--- branches/work/phonon-xine-with-engine-per-stream/bytestream.h #833282:833283
@@ -2,9 +2,10 @@
     Copyright (C) 2006 Tim Beaulen <tbscope@gmail.com>
     Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>
 
-    This library is free software; you can redistribute it and/or
+    This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
-    License version 2 as published by the Free Software Foundation.
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,6 +38,8 @@
 #include <cstdlib>
 #include <QObject>
 
+extern const char Error__off_t_needs_to_have_64_bits[sizeof(off_t) == 8 ? 1 : -1];
+
 namespace Phonon
 {
 namespace Xine
[prev in list] [next in list] [prev in thread] [next in thread]