summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-11-27 22:33:01 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-11-27 22:33:01 +0000
commit3183a7ee7a9fddefe354a028236c7cd92e8661dd (patch)
tree5b12e7acf61e29d904011240396d3de84f68978c /src
parent095030785fbc4e2616000f6e6198cdc324682a4b (diff)
downloadxine-lib-3183a7ee7a9fddefe354a028236c7cd92e8661dd.tar.gz
xine-lib-3183a7ee7a9fddefe354a028236c7cd92e8661dd.tar.bz2
fix compiler warning about LOG_MODULE being redefined
CVS patchset: 5809 CVS date: 2003/11/27 22:33:01
Diffstat (limited to 'src')
-rw-r--r--src/input/input_pnm.c2
-rw-r--r--src/input/input_rtsp.c2
-rw-r--r--src/input/libreal/rmff.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 2f4c61557..efa9bee59 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -33,7 +33,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include "bswap.h"
#define LOG_MODULE "input_pnm"
#define LOG_VERBOSE
@@ -41,6 +40,7 @@
#define LOG
*/
+#include "bswap.h"
#include "xine_internal.h"
#include "xineutils.h"
#include "input_plugin.h"
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 671bff710..a1926dc41 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -33,7 +33,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include "bswap.h"
#define LOG_MODULE "input_rtsp"
#define LOG_VERBOSE
@@ -41,6 +40,7 @@
#define LOG
*/
+#include "bswap.h"
#include "xine_internal.h"
#include "xineutils.h"
#include "input_plugin.h"
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index a87b80f0c..8229a8208 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -17,14 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: rmff.c,v 1.4 2003/11/26 19:43:31 f1rmb Exp $
+ * $Id: rmff.c,v 1.5 2003/11/27 22:33:01 mroi Exp $
*
* functions for real media file format
* adopted from joschkas real tools
*/
-#include <xineutils.h>
-
#define LOG_MODULE "rmff"
#define LOG_VERBOSE
/*